Skip to content

Commit

Permalink
bump devise
Browse files Browse the repository at this point in the history
  • Loading branch information
jhass committed Nov 24, 2014
1 parent 54de057 commit 82af2e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'unicorn'

gem 'mysql2'

gem 'devise', '~> 3.3.0'
gem 'devise', '~> 3.4.0'
gem 'rails_admin'

gem 'rails_locale_detection', '~> 2.0.0.pre'
Expand Down
7 changes: 5 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.8.0)
devise (3.3.0)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
Expand Down Expand Up @@ -136,6 +137,8 @@ GEM
rake (10.3.2)
redcarpet (3.1.2)
remotipart (1.2.1)
responders (1.1.2)
railties (>= 3.2, < 4.2)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
Expand Down Expand Up @@ -201,7 +204,7 @@ DEPENDENCIES
bootstrap-sass (~> 3.2.0)
capybara (~> 2.4.1)
coffee-rails (~> 4.0.0)
devise (~> 3.3.0)
devise (~> 3.4.0)
fuubar (~> 2.0.0)
jquery-rails
mysql2
Expand Down

0 comments on commit 82af2e9

Please sign in to comment.