diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-01-17 17:02:55 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-01-17 17:02:55 +0000 |
| commit | d85f73a30d48b3472346fb712106e6d5f4403278 (patch) | |
| tree | 35d9205b3bf1da3c4e1cc9fc7699f798395d4702 /lib/tasks | |
| parent | 3ea8b706978b490fc54cde8e14dcde2a748dec1a (diff) | |
| download | redmine-d85f73a30d48b3472346fb712106e6d5f4403278.tar.gz redmine-d85f73a30d48b3472346fb712106e6d5f4403278.zip | |
Upgrade to Rails 4.2.0 (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13892 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/initializers.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/testing.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/initializers.rake b/lib/tasks/initializers.rake index c1fdc7bf5..6da60c147 100644 --- a/lib/tasks/initializers.rake +++ b/lib/tasks/initializers.rake @@ -15,7 +15,7 @@ file 'config/initializers/secret_token.rb' do # change this key, all old sessions will become invalid! Make sure the # secret is at least 30 characters and all random, no regular words or # you'll be exposed to dictionary attacks. -RedmineApp::Application.config.secret_token = '#{secret}' +RedmineApp::Application.config.secret_key_base = '#{secret}' EOF end end diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake index e267d0820..f87ffc1fd 100644 --- a/lib/tasks/testing.rake +++ b/lib/tasks/testing.rake @@ -104,7 +104,7 @@ namespace :test do Rake::TestTask.new(:ui => "db:test:prepare") do |t| t.libs << "test" t.verbose = true - t.test_files = FileList['test/ui/**/*_test.rb'] + t.test_files = FileList['test/ui/**/*_test_ui.rb'] end Rake::Task['test:ui'].comment = "Run the UI tests with Capybara (PhantomJS listening on port 4444 is required)" end |