Download as
Browse Code »

Commit a844dead81a80d1f2c27e6f595d727c23f89ce6d

Authored by Nathan Broadbent
1 parent 6281b31a
Exists in master and in 1 other branch production

Upgraded devise to ~> 1.4.0. Committed new Gemfile.lock with updated dependencie… 

…s. All tests passing.
Showing 2 changed files with 8 additions and 6 deletions   Show diff stats
@@ -5,7 +5,7 @@ gem 'nokogiri' @@ -5,7 +5,7 @@ gem 'nokogiri'
5 gem 'mongoid', '2.0.2' 5 gem 'mongoid', '2.0.2'
6 gem 'haml' 6 gem 'haml'
7 gem 'will_paginate' 7 gem 'will_paginate'
8 -gem 'devise', '~> 1.1.8' 8 +gem 'devise', '~> 1.4.0'
9 gem 'lighthouse-api' 9 gem 'lighthouse-api'
10 gem 'redmine_client', :git => "git://github.com/oruen/redmine_client.git" 10 gem 'redmine_client', :git => "git://github.com/oruen/redmine_client.git"
11 gem 'mongoid_rails_migrations' 11 gem 'mongoid_rails_migrations'
@@ -44,9 +44,10 @@ GEM @@ -44,9 +44,10 @@ GEM
44 crack (0.1.8) 44 crack (0.1.8)
45 daemons (1.1.4) 45 daemons (1.1.4)
46 database_cleaner (0.6.7) 46 database_cleaner (0.6.7)
47 - devise (1.1.9) 47 + devise (1.4.2)
48 bcrypt-ruby (~> 2.1.2) 48 bcrypt-ruby (~> 2.1.2)
49 - warden (~> 1.0.2) 49 + orm_adapter (~> 0.0.3)
  50 + warden (~> 1.0.3)
50 diff-lcs (1.1.2) 51 diff-lcs (1.1.2)
51 email_spec (1.1.1) 52 email_spec (1.1.1)
52 rspec (~> 2.0) 53 rspec (~> 2.0)
@@ -83,6 +84,7 @@ GEM @@ -83,6 +84,7 @@ GEM
83 rails (~> 3.0.0) 84 rails (~> 3.0.0)
84 railties (~> 3.0.0) 85 railties (~> 3.0.0)
85 nokogiri (1.4.4) 86 nokogiri (1.4.4)
  87 + orm_adapter (0.0.5)
86 pivotal-tracker (0.2.0) 88 pivotal-tracker (0.2.0)
87 builder 89 builder
88 happymapper (>= 0.2.4) 90 happymapper (>= 0.2.4)
@@ -138,8 +140,8 @@ GEM @@ -138,8 +140,8 @@ GEM
138 mime-types 140 mime-types
139 tzinfo (0.3.26) 141 tzinfo (0.3.26)
140 useragent (0.3.1) 142 useragent (0.3.1)
141 - warden (1.0.3)  
142 - rack (>= 1.0.0) 143 + warden (1.0.5)
  144 + rack (>= 1.0)
143 webmock (1.6.2) 145 webmock (1.6.2)
144 addressable (>= 2.2.2) 146 addressable (>= 2.2.2)
145 crack (>= 0.1.7) 147 crack (>= 0.1.7)
@@ -151,7 +153,7 @@ PLATFORMS @@ -151,7 +153,7 @@ PLATFORMS
151 DEPENDENCIES 153 DEPENDENCIES
152 bson_ext (~> 1.3.1) 154 bson_ext (~> 1.3.1)
153 database_cleaner (~> 0.6.0) 155 database_cleaner (~> 0.6.0)
154 - devise (~> 1.1.8) 156 + devise (~> 1.4.0)
155 email_spec 157 email_spec
156 factory_girl_rails 158 factory_girl_rails
157 haml 159 haml