diff options
| author | DJ Mountney <david@twkie.net> | 2019-06-20 09:42:25 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2019-06-25 10:44:40 -0700 |
| commit | e1befc9b3f4d24dc1d4f5108658725af5244ac67 (patch) | |
| tree | 107ee104fcf6dd4f911bf12ec3902727d11784aa | |
| parent | e448124fab59ce562fac5db9d9919d24ac95fba7 (diff) | |
| download | gitlab-ce-e1befc9b3f4d24dc1d4f5108658725af5244ac67.tar.gz | |
Drop the source upgrade change
We no longer need to point people away from using db:migrate
| -rw-r--r-- | doc/update/upgrading_from_source.md | 2 | ||||
| -rw-r--r-- | lib/tasks/migrate/schema_check.rake | 2 | ||||
| -rw-r--r-- | spec/tasks/gitlab/uploads/check_rake_spec.rb | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index e454f4b2c0d..023dc7d6de3 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -324,7 +324,7 @@ sudo -u git -H bundle install --deployment --without development test mysql aws sudo -u git -H bundle clean # Run database migrations -sudo -u git -H bundle exec rake gitlab:db:configure RAILS_ENV=production +sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production # Compile GetText PO files diff --git a/lib/tasks/migrate/schema_check.rake b/lib/tasks/migrate/schema_check.rake index d78599a3759..ea4131d8bc2 100644 --- a/lib/tasks/migrate/schema_check.rake +++ b/lib/tasks/migrate/schema_check.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc 'Configures the database by running migrate, or by loading the schema and seeding if needed' task schema_version_check: :environment do next if ENV['SKIP_SCHEMA_VERSION_CHECK'] diff --git a/spec/tasks/gitlab/uploads/check_rake_spec.rb b/spec/tasks/gitlab/uploads/check_rake_spec.rb index 5d597c66133..91f0cedb246 100644 --- a/spec/tasks/gitlab/uploads/check_rake_spec.rb +++ b/spec/tasks/gitlab/uploads/check_rake_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rake_helper' describe 'gitlab:uploads rake tasks' do |