alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-03-18 15:42:39 +08:00
parent 0d8d6b24c3 fb8c8d4526
commit ab4eefce87
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/initializers/omniauth.rb
View File

@ -1,7 +1,7 @@
OmniAuth.config.logger = Rails.logger OmniAuth.config.logger = Rails.logger
site = Site.first rescue nil
site = Site.first if !site.nil?
client_id = site.google_client_id client_id = site.google_client_id
client_secret = site.google_client_secret client_secret = site.google_client_secret
@ -13,3 +13,4 @@ else
site.google_oauth_enabled = false site.google_oauth_enabled = false
site.save site.save
end end
end