sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update Devise to version 2. Comes with some error that prevents the whole up from running, though.

Browse source
This commit is contained in:
Roland Jesse 2012-04-22 23:03:20 +02:00
parent a1b11d20c1
commit 761c73a036
5 changed files with 69 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Gemfile.lock
View file

@ -41,7 +41,7 @@ GEM
multi_json (~> 1.0)
addressable (2.2.7)
arel (3.0.2)
bcrypt-ruby (2.1.4)
bcrypt-ruby (3.0.1)
bourbon (1.4.0)
sass (>= 3.1)
builder (3.0.0)
@ -59,10 +59,11 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.1)
devise (1.2.1)
bcrypt-ruby (~> 2.1.2)
devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
railties (~> 3.1)
warden (~> 1.1.1)
erubis (2.7.0)
execjs (1.3.0)
multi_json (~> 1.0)
@ -169,7 +170,7 @@ GEM
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
warden (1.0.6)
warden (1.1.1)
rack (>= 1.0)
PLATFORMS
@ -177,11 +178,11 @@ PLATFORMS
DEPENDENCIES
activeadmin (= 0.4.0)
bcrypt-ruby (= 2.1.4)
bcrypt-ruby (= 3.0.1)
cancan (= 1.6.5)
capistrano (= 2.5.21)
coffee-rails (= 3.2.2)
devise (= 1.2.1)
devise (= 2.0.4)
mail
mysql2 (= 0.2.7)
rails (= 3.2.3)