zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-08 21:54:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #847 from internetee/upgrade-devise

Browse source 
Update Devise to latest version
This commit is contained in:
Timo Võhmar 2018-05-14 11:28:21 +03:00 • committed by GitHub
commit 980d8dfbfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -52,7 +52,7 @@ gem 'liquid', '3.0.6' # for email templates
# rights # rights
gem 'cancancan', '1.11.0' # autharization gem 'cancancan', '1.11.0' # autharization
gem 'devise', '3.5.4' # authenitcation gem 'devise', '4.4.3' # authenitcation
# rest api # rest api
gem 'grape', '0.12.0' gem 'grape', '0.12.0'

12
Gemfile.lock
View file

@ -167,12 +167,11 @@ GEM
database_cleaner (1.6.1) database_cleaner (1.6.1)
descendants_tracker (0.0.4) descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
devise (3.5.4) devise (4.4.3)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 4.1.0, < 6.0)
responders responders
thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
diff-lcs (1.3) diff-lcs (1.3)
docile (1.1.5) docile (1.1.5)
@ -350,8 +349,9 @@ GEM
polyamorous (~> 1.1) polyamorous (~> 1.1)
rdoc (4.3.0) rdoc (4.3.0)
request_store (1.1.0) request_store (1.1.0)
responders (2.3.0) responders (2.4.0)
railties (>= 4.2.0, < 5.1) actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rest-client (2.0.1) rest-client (2.0.1)
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0) mime-types (>= 1.16, < 4.0)
@ -491,7 +491,7 @@ DEPENDENCIES
daemons-rails (= 1.2.1) daemons-rails (= 1.2.1)
data_migrate! data_migrate!
database_cleaner database_cleaner
devise (= 3.5.4) devise (= 4.4.3)
digidoc_client! digidoc_client!
epp (= 1.5.0)! epp (= 1.5.0)!
epp-xml (= 1.1.0)! epp-xml (= 1.1.0)!