diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-04-25 08:14:04 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-04-25 08:14:04 +0000 |
| commit | 16516fb48a18242035bea959ac79a436c04b19eb (patch) | |
| tree | 3aa65904e4dd0ea2aff55d346699efc4ef75b8d9 | |
| parent | 1c8527b8c166d375f208115caf764c9694310318 (diff) | |
| download | redmine-16516fb48a18242035bea959ac79a436c04b19eb.tar.gz redmine-16516fb48a18242035bea959ac79a436c04b19eb.zip | |
Merged r14217 (#19185).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14218 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | doc/INSTALL | 3 | ||||
| -rw-r--r-- | doc/UPGRADING | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/doc/INSTALL b/doc/INSTALL index 2adc73641..cf36dd86b 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -53,6 +53,9 @@ Optional: a secret to be generated. Under the application main directory run: bundle exec rake generate_secret_token + Alternatively, you can store this secret in config/secrets.yml: + http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#config-secrets-yml + 6. Create the database structure Under the application main directory run: diff --git a/doc/UPGRADING b/doc/UPGRADING index 9bf0536d8..729b006ce 100644 --- a/doc/UPGRADING +++ b/doc/UPGRADING @@ -44,10 +44,16 @@ http://www.redmine.org/ 6. Generate a session store secret - Redmine stores session data in cookies by default, which requires - a secret to be generated. Under the new application directory run: + If you're upgrading from Redmine 2.x or below, remove the following file + if it exists: config/initializers/secret_token.rb + + Then generate a new secret by running the following command under the + application directory: bundle exec rake generate_secret_token - + + Alternatively, you can store this secret in config/secrets.yml: + http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#config-secrets-yml + DO NOT REPLACE OR EDIT ANY OTHER FILES. 7. Migrate your database |