File tree 2 files changed +14
-3
lines changed
2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,11 @@ class Railtie < ::Rails::Railtie
29
29
if app . secrets . secret_key_base . blank?
30
30
raise "Missing `secret_key_base` for '#{ Rails . env } ' environment, set this value in `config/secrets.yml`"
31
31
else
32
- app . config . secret_key_base = app . secrets . secret_key_base
32
+ if Rails ::VERSION ::MAJOR < 4
33
+ app . config . secret_token = app . secrets . secret_key_base
34
+ else
35
+ app . config . secret_key_base = app . secrets . secret_key_base
36
+ end
33
37
end
34
38
end
35
39
end
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ class RailsSecretsTest < ActiveSupport::TestCase
13
13
end
14
14
15
15
test "config.secret_key_base is copied from secrets.secret_key_base" do
16
- assert_equal app . secrets . secret_key_base , app . config . secret_key_base
16
+ assert_equal app . secrets . secret_key_base , secret_key_base
17
17
end
18
18
19
19
private
@@ -22,4 +22,11 @@ def app
22
22
Rails . application
23
23
end
24
24
25
- end
25
+ def secret_key_base
26
+ if Rails ::VERSION ::MAJOR < 4
27
+ app . config . secret_token
28
+ else
29
+ app . config . secret_key_base
30
+ end
31
+ end
32
+ end
You can’t perform that action at this time.
0 commit comments