Delint
This commit is contained in:
parent
1ec99a5018
commit
35a532ceab
2 changed files with 2 additions and 2 deletions
|
|
@ -184,7 +184,7 @@ module ApplicationHelper
|
||||||
image_tag('snapcon_logo.png'),
|
image_tag('snapcon_logo.png'),
|
||||||
root_path,
|
root_path,
|
||||||
class: 'navbar-brand',
|
class: 'navbar-brand',
|
||||||
title: ENV['OSEM_NAME']
|
title: nav_link_text(conference)
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ Devise.setup do |config|
|
||||||
scope: 'email'
|
scope: 'email'
|
||||||
|
|
||||||
config.omniauth :discourse,
|
config.omniauth :discourse,
|
||||||
sso_url: "https://forum.snap.berkeley.edu/session/sso_provider",
|
sso_url: 'https://forum.snap.berkeley.edu/session/sso_provider',
|
||||||
sso_secret: ENV['OSEM_DISCOURSE_SECRET']
|
sso_secret: ENV['OSEM_DISCOURSE_SECRET']
|
||||||
|
|
||||||
# config.omniauth :facebook, (ENV['OSEM_FACEBOOK_KEY'] || Rails.application.secrets.facebook_key), (ENV['OSEM_FACEBOOK_SECRET'] || Rails.application.secrets.facebook_secret)
|
# config.omniauth :facebook, (ENV['OSEM_FACEBOOK_KEY'] || Rails.application.secrets.facebook_key), (ENV['OSEM_FACEBOOK_SECRET'] || Rails.application.secrets.facebook_secret)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue