Download as
Browse Code »

Commit 2d56d89b92198502a6ed2c684d6b4d1a51bb119f

Authored by Dmitriy Zaporozhets
1 parent 76eb9532
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

update devise to 2.2.5

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
@@ -15,7 +15,7 @@ gem "mysql2", group: :mysql @@ -15,7 +15,7 @@ gem "mysql2", group: :mysql
15 gem "pg", group: :postgres 15 gem "pg", group: :postgres
16 16
17 # Auth 17 # Auth
18 -gem "devise" 18 +gem "devise", '~> 2.2'
19 gem 'omniauth', "~> 1.1.3" 19 gem 'omniauth', "~> 1.1.3"
20 gem 'omniauth-google-oauth2' 20 gem 'omniauth-google-oauth2'
21 gem 'omniauth-twitter' 21 gem 'omniauth-twitter'
@@ -49,7 +49,7 @@ GEM @@ -49,7 +49,7 @@ GEM
49 asciidoctor (0.1.3) 49 asciidoctor (0.1.3)
50 awesome_print (1.1.0) 50 awesome_print (1.1.0)
51 backports (3.3.2) 51 backports (3.3.2)
52 - bcrypt-ruby (3.0.1) 52 + bcrypt-ruby (3.1.1)
53 better_errors (0.9.0) 53 better_errors (0.9.0)
54 coderay (>= 1.0.0) 54 coderay (>= 1.0.0)
55 erubis (>= 2.6.6) 55 erubis (>= 2.6.6)
@@ -111,7 +111,7 @@ GEM @@ -111,7 +111,7 @@ GEM
111 database_cleaner (1.0.1) 111 database_cleaner (1.0.1)
112 debug_inspector (0.0.2) 112 debug_inspector (0.0.2)
113 descendants_tracker (0.0.1) 113 descendants_tracker (0.0.1)
114 - devise (2.2.4) 114 + devise (2.2.5)
115 bcrypt-ruby (~> 3.0) 115 bcrypt-ruby (~> 3.0)
116 orm_adapter (~> 0.1) 116 orm_adapter (~> 0.1)
117 railties (~> 3.1) 117 railties (~> 3.1)
@@ -535,7 +535,7 @@ GEM @@ -535,7 +535,7 @@ GEM
535 virtus (0.5.5) 535 virtus (0.5.5)
536 backports (~> 3.3) 536 backports (~> 3.3)
537 descendants_tracker (~> 0.0.1) 537 descendants_tracker (~> 0.0.1)
538 - warden (1.2.1) 538 + warden (1.2.3)
539 rack (>= 1.0) 539 rack (>= 1.0)
540 webmock (1.11.0) 540 webmock (1.11.0)
541 addressable (>= 2.2.7) 541 addressable (>= 2.2.7)
@@ -564,7 +564,7 @@ DEPENDENCIES @@ -564,7 +564,7 @@ DEPENDENCIES
564 coveralls 564 coveralls
565 d3_rails (~> 3.1.4) 565 d3_rails (~> 3.1.4)
566 database_cleaner 566 database_cleaner
567 - devise 567 + devise (~> 2.2)
568 email_spec 568 email_spec
569 enumerize 569 enumerize
570 factory_girl_rails 570 factory_girl_rails