Commit a09de0d8a6221c0bfe579c39d4e838b8bb5c8586
Exists in
master
and in
1 other branch
Merge pull request #378 from cheald/master
Update Devise per posted security bulletin
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
Gemfile
| ... | ... | @@ -3,7 +3,7 @@ source 'http://rubygems.org' |
| 3 | 3 | gem 'rails', '3.2.11' |
| 4 | 4 | gem 'mongoid', '~> 2.4.10' |
| 5 | 5 | gem 'mongoid_rails_migrations' |
| 6 | -gem 'devise', '~> 1.5.3' | |
| 6 | +gem 'devise', '~> 1.5.4' | |
| 7 | 7 | gem 'haml' |
| 8 | 8 | gem 'htmlentities', "~> 4.3.0" |
| 9 | 9 | gem 'rack-ssl', :require => 'rack/ssl' # force SSL | ... | ... |
Gemfile.lock
| ... | ... | @@ -86,7 +86,7 @@ GEM |
| 86 | 86 | debugger-linecache (1.1.2) |
| 87 | 87 | debugger-ruby_core_source (>= 1.1.1) |
| 88 | 88 | debugger-ruby_core_source (1.1.4) |
| 89 | - devise (1.5.3) | |
| 89 | + devise (1.5.4) | |
| 90 | 90 | bcrypt-ruby (~> 3.0) |
| 91 | 91 | orm_adapter (~> 0.0.3) |
| 92 | 92 | warden (~> 1.1) |
| ... | ... | @@ -106,7 +106,7 @@ GEM |
| 106 | 106 | ffi (1.1.4) |
| 107 | 107 | foreman (0.60.2) |
| 108 | 108 | thor (>= 0.13.6) |
| 109 | - haml (3.1.6) | |
| 109 | + haml (3.1.7) | |
| 110 | 110 | happymapper (0.4.0) |
| 111 | 111 | libxml-ruby (~> 2.0) |
| 112 | 112 | has_scope (0.5.1) |
| ... | ... | @@ -340,7 +340,7 @@ DEPENDENCIES |
| 340 | 340 | capybara |
| 341 | 341 | database_cleaner (~> 0.6.0) |
| 342 | 342 | debugger |
| 343 | - devise (~> 1.5.3) | |
| 343 | + devise (~> 1.5.4) | |
| 344 | 344 | email_spec |
| 345 | 345 | execjs |
| 346 | 346 | fabrication (~> 1.3.0) | ... | ... |