Commit 0a26778684ad43e2d44f0e59aa35c9675ba457ae
1 parent
f391c790
Exists in
master
and in
1 other branch
Upgrade devise to 3.4.1
Showing
1 changed file
with
7 additions
and
4 deletions
Show diff stats
Gemfile.lock
@@ -50,7 +50,7 @@ GEM | @@ -50,7 +50,7 @@ GEM | ||
50 | builder | 50 | builder |
51 | json | 51 | json |
52 | arel (5.0.1.20140414130214) | 52 | arel (5.0.1.20140414130214) |
53 | - bcrypt-ruby (3.1.2) | 53 | + bcrypt (3.1.9) |
54 | better_errors (1.0.1) | 54 | better_errors (1.0.1) |
55 | coderay (>= 1.0.0) | 55 | coderay (>= 1.0.0) |
56 | erubis (>= 2.6.6) | 56 | erubis (>= 2.6.6) |
@@ -93,10 +93,11 @@ GEM | @@ -93,10 +93,11 @@ GEM | ||
93 | database_cleaner (1.2.0) | 93 | database_cleaner (1.2.0) |
94 | debug_inspector (0.0.2) | 94 | debug_inspector (0.0.2) |
95 | decent_exposure (2.3.2) | 95 | decent_exposure (2.3.2) |
96 | - devise (3.1.1) | ||
97 | - bcrypt-ruby (~> 3.0) | 96 | + devise (3.4.1) |
97 | + bcrypt (~> 3.0) | ||
98 | orm_adapter (~> 0.1) | 98 | orm_adapter (~> 0.1) |
99 | railties (>= 3.2.6, < 5) | 99 | railties (>= 3.2.6, < 5) |
100 | + responders | ||
100 | thread_safe (~> 0.1) | 101 | thread_safe (~> 0.1) |
101 | warden (~> 1.2.3) | 102 | warden (~> 1.2.3) |
102 | diff-lcs (1.2.4) | 103 | diff-lcs (1.2.4) |
@@ -210,7 +211,7 @@ GEM | @@ -210,7 +211,7 @@ GEM | ||
210 | omniauth (~> 1.0) | 211 | omniauth (~> 1.0) |
211 | optionable (0.2.0) | 212 | optionable (0.2.0) |
212 | origin (2.1.1) | 213 | origin (2.1.1) |
213 | - orm_adapter (0.4.0) | 214 | + orm_adapter (0.5.0) |
214 | pjax_rails (0.3.4) | 215 | pjax_rails (0.3.4) |
215 | jquery-rails | 216 | jquery-rails |
216 | poltergeist (1.5.1) | 217 | poltergeist (1.5.1) |
@@ -261,6 +262,8 @@ GEM | @@ -261,6 +262,8 @@ GEM | ||
261 | rdoc (4.1.2) | 262 | rdoc (4.1.2) |
262 | json (~> 1.4) | 263 | json (~> 1.4) |
263 | request_store (1.0.6) | 264 | request_store (1.0.6) |
265 | + responders (1.1.2) | ||
266 | + railties (>= 3.2, < 4.2) | ||
264 | rest-client (1.6.8) | 267 | rest-client (1.6.8) |
265 | mime-types (~> 1.16) | 268 | mime-types (~> 1.16) |
266 | rdoc (>= 2.4.2) | 269 | rdoc (>= 2.4.2) |