diff --git a/Gemfile b/Gemfile index b54ef1e..35573a2 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'nokogiri' gem 'mongoid', '2.0.2' gem 'haml' gem 'will_paginate' -gem 'devise', '~> 1.1.8' +gem 'devise', '~> 1.4.0' gem 'lighthouse-api' gem 'redmine_client', :git => "git://github.com/oruen/redmine_client.git" gem 'mongoid_rails_migrations' diff --git a/Gemfile.lock b/Gemfile.lock index 3b18f78..6b3c83f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,9 +44,10 @@ GEM crack (0.1.8) daemons (1.1.4) database_cleaner (0.6.7) - devise (1.1.9) + devise (1.4.2) bcrypt-ruby (~> 2.1.2) - warden (~> 1.0.2) + orm_adapter (~> 0.0.3) + warden (~> 1.0.3) diff-lcs (1.1.2) email_spec (1.1.1) rspec (~> 2.0) @@ -83,6 +84,7 @@ GEM rails (~> 3.0.0) railties (~> 3.0.0) nokogiri (1.4.4) + orm_adapter (0.0.5) pivotal-tracker (0.2.0) builder happymapper (>= 0.2.4) @@ -138,8 +140,8 @@ GEM mime-types tzinfo (0.3.26) useragent (0.3.1) - warden (1.0.3) - rack (>= 1.0.0) + warden (1.0.5) + rack (>= 1.0) webmock (1.6.2) addressable (>= 2.2.2) crack (>= 0.1.7) @@ -151,7 +153,7 @@ PLATFORMS DEPENDENCIES bson_ext (~> 1.3.1) database_cleaner (~> 0.6.0) - devise (~> 1.1.8) + devise (~> 1.4.0) email_spec factory_girl_rails haml -- libgit2 0.21.2