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