diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-06 20:03:29 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-09-06 20:03:29 +0000 |
| commit | bd3cac6f37f5b9a8a46f278c667ba3517da8eb1c (patch) | |
| tree | c52e2871b33d1fbe9a2fe13c5cd727bc895794dd | |
| parent | 5e861f2322ec02897f8736e7a224654f53de6d84 (diff) | |
| parent | eac86b3e5fbea4afb4c5e0ec2fc30c4c62a663bb (diff) | |
| download | gitlab-ce-bd3cac6f37f5b9a8a46f278c667ba3517da8eb1c.tar.gz | |
Merge branch 'jk-fix-migrate' into 'master'
reset namespace columns in migration
See merge request !14089
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | db/migrate/20170825104051_migrate_issues_to_ghost_user.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b76c8f00d77..70b0cde17ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -412,7 +412,6 @@ db:migrate:reset-mysql: .migration-paths: &migration-paths <<: *dedicated-runner - <<: *only-canonical-masters <<: *pull-cache stage: test variables: diff --git a/db/migrate/20170825104051_migrate_issues_to_ghost_user.rb b/db/migrate/20170825104051_migrate_issues_to_ghost_user.rb index 294141e4fdb..c5fb5762d61 100644 --- a/db/migrate/20170825104051_migrate_issues_to_ghost_user.rb +++ b/db/migrate/20170825104051_migrate_issues_to_ghost_user.rb @@ -18,6 +18,7 @@ class MigrateIssuesToGhostUser < ActiveRecord::Migration ActiveRecord::Base.clear_cache! ::User.reset_column_information + ::Namespace.reset_column_information end def up |