Merge branch 'jk-fix-migrate' into 'master'

reset namespace columns in migration See merge request !14089

Merge branch 'jk-fix-migrate' into 'master'
bd3cac6f · Robert Speicher · 5e861f23 · eac86b3e · bd3cac6f · bd3cac6f
Commit bd3cac6f authored Sep 06, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

.gitlab-ci.yml .gitlab-ci.yml +0 -1

20170825104051_migrate_issues_to_ghost_user.rb db/migrate/20170825104051_migrate_issues_to_ghost_user.rb +1 -0

No files found.
--- 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:

--- 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