Download as
Browse Code »

Commit d55891c9ba2c27b40f5ea889fd8b0a92e9d9caec

Authored by Cyril Mougel
1 parent 1c9fab7e
Exists in master and in 1 other branch production

Update to devise 3.1

Showing 3 changed files with 11 additions and 5 deletions   Show diff stats
@@ -9,7 +9,7 @@ gem 'railties', RAILS_VERSION @@ -9,7 +9,7 @@ gem 'railties', RAILS_VERSION
9 gem 'mongoid' 9 gem 'mongoid'
10 10
11 gem 'mongoid_rails_migrations' 11 gem 'mongoid_rails_migrations'
12 -gem 'devise', '~> 2.2.1' 12 +gem 'devise'
13 gem 'haml' 13 gem 'haml'
14 gem 'htmlentities' 14 gem 'htmlentities'
15 gem 'rack-ssl', :require => 'rack/ssl' # force SSL 15 gem 'rack-ssl', :require => 'rack/ssl' # force SSL
@@ -44,6 +44,7 @@ GEM @@ -44,6 +44,7 @@ GEM
44 builder 44 builder
45 json 45 json
46 arel (3.0.2) 46 arel (3.0.2)
  47 + atomic (1.1.14)
47 bcrypt-ruby (3.1.2) 48 bcrypt-ruby (3.1.2)
48 better_errors (1.0.1) 49 better_errors (1.0.1)
49 coderay (>= 1.0.0) 50 coderay (>= 1.0.0)
@@ -97,11 +98,12 @@ GEM @@ -97,11 +98,12 @@ GEM
97 debugger-linecache (1.2.0) 98 debugger-linecache (1.2.0)
98 debugger-ruby_core_source (1.2.3) 99 debugger-ruby_core_source (1.2.3)
99 decent_exposure (2.3.0) 100 decent_exposure (2.3.0)
100 - devise (2.2.7) 101 + devise (3.1.0)
101 bcrypt-ruby (~> 3.0) 102 bcrypt-ruby (~> 3.0)
102 orm_adapter (~> 0.1) 103 orm_adapter (~> 0.1)
103 - railties (~> 3.1)  
104 - warden (~> 1.2.1) 104 + railties (>= 3.2.6, < 5)
  105 + thread_safe (~> 0.1)
  106 + warden (~> 1.2.3)
105 diff-lcs (1.2.4) 107 diff-lcs (1.2.4)
106 dotenv (0.9.0) 108 dotenv (0.9.0)
107 email_spec (1.5.0) 109 email_spec (1.5.0)
@@ -353,6 +355,8 @@ GEM @@ -353,6 +355,8 @@ GEM
353 libv8 (~> 3.16.14.0) 355 libv8 (~> 3.16.14.0)
354 ref 356 ref
355 thor (0.18.1) 357 thor (0.18.1)
  358 + thread_safe (0.1.3)
  359 + atomic
356 tilt (1.4.1) 360 tilt (1.4.1)
357 timecop (0.6.1) 361 timecop (0.6.1)
358 tins (0.10.0) 362 tins (0.10.0)
@@ -401,7 +405,7 @@ DEPENDENCIES @@ -401,7 +405,7 @@ DEPENDENCIES
401 database_cleaner (~> 0.9.0) 405 database_cleaner (~> 0.9.0)
402 debugger 406 debugger
403 decent_exposure 407 decent_exposure
404 - devise (~> 2.2.1) 408 + devise
405 email_spec 409 email_spec
406 execjs 410 execjs
407 fabrication 411 fabrication
config/initializers/secret_token.rb
  Diff comments   View file @d55891c
@@ -34,3 +34,5 @@ else @@ -34,3 +34,5 @@ else
34 ERROR 34 ERROR
35 end 35 end
36 end 36 end
  37 +
  38 +Devise.secret_key = Errbit::Application.config.secret_token