gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into copy-organizations

Browse source
This commit is contained in:
Shlok Srivastava 2017-06-12 22:46:53 +05:30 • committed by GitHub
commit 6bb2143282
5 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/conference.rb
View file

@ -899,7 +899,7 @@ class Conference < ActiveRecord::Base
hash[key] = 0
end
end
Hash[ hash.sort ]
Hash[hash.sort]
end
##

4
app/models/user.rb
View file

@ -26,11 +26,11 @@ class User < ActiveRecord::Base
devise_modules = []
if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
devise_modules += [ :ichain_authenticatable, :ichain_registerable, :omniauthable, omniauth_providers: [] ]
devise_modules += [:ichain_authenticatable, :ichain_registerable, :omniauthable, omniauth_providers: []]
else
devise_modules += [:database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable, :confirmable,
:omniauthable, omniauth_providers: [:suse, :google, :facebook, :github] ]
:omniauthable, omniauth_providers: [:suse, :google, :facebook, :github]]
end
devise(*devise_modules)