From 7533169bb974bc50d79e8ddafab3e87dba5da991 Mon Sep 17 00:00:00 2001
From: Doug Stull <dstull@gitlab.com>
Date: Tue, 29 Oct 2019 10:14:33 -0400
Subject: [PATCH] Ensure post migrate is later than rename
---
...up-from-adjusts-snowplow-to-use-cookies-for-sessions.yml | 5 +++++
...1028184740_rename_snowplow_site_id_to_snowplow_app_id.rb | 2 ++
...cleanup_application_settings_snowplow_site_id_rename.rb} | 2 ++
locale/gitlab.pot | 6 +++---
4 files changed, 12 insertions(+), 3 deletions(-)
create mode 100644 changelogs/unreleased/31222-follow-up-from-adjusts-snowplow-to-use-cookies-for-sessions.yml
rename db/post_migrate/{20191028145040_cleanup_application_settings_snowplow_site_id_rename.rb => 20191029095537_cleanup_application_settings_snowplow_site_id_rename.rb} (95%)
diff --git a/changelogs/unreleased/31222-follow-up-from-adjusts-snowplow-to-use-cookies-for-sessions.yml b/changelogs/unreleased/31222-follow-up-from-adjusts-snowplow-to-use-cookies-for-sessions.yml
new file mode 100644
index 0000000000000..6d62663a0bcdb
--- /dev/null
+++ b/changelogs/unreleased/31222-follow-up-from-adjusts-snowplow-to-use-cookies-for-sessions.yml
@@ -0,0 +1,5 @@
+---
+title: Rename snowplow_site_id to snowplow_app_id in application_settings table
+merge_request: 19252
+author:
+type: other
diff --git a/db/migrate/20191028184740_rename_snowplow_site_id_to_snowplow_app_id.rb b/db/migrate/20191028184740_rename_snowplow_site_id_to_snowplow_app_id.rb
index 601c18f9d40ee..4e3b2da670efc 100644
--- a/db/migrate/20191028184740_rename_snowplow_site_id_to_snowplow_app_id.rb
+++ b/db/migrate/20191028184740_rename_snowplow_site_id_to_snowplow_app_id.rb
@@ -3,6 +3,8 @@
class RenameSnowplowSiteIdToSnowplowAppId < ActiveRecord::Migration[5.2]
include Gitlab::Database::MigrationHelpers
+ DOWNTIME = false
+
disable_ddl_transaction!
def up
diff --git a/db/post_migrate/20191028145040_cleanup_application_settings_snowplow_site_id_rename.rb b/db/post_migrate/20191029095537_cleanup_application_settings_snowplow_site_id_rename.rb
similarity index 95%
rename from db/post_migrate/20191028145040_cleanup_application_settings_snowplow_site_id_rename.rb
rename to db/post_migrate/20191029095537_cleanup_application_settings_snowplow_site_id_rename.rb
index b68d234b483ee..83b4a2af2b625 100644
--- a/db/post_migrate/20191028145040_cleanup_application_settings_snowplow_site_id_rename.rb
+++ b/db/post_migrate/20191029095537_cleanup_application_settings_snowplow_site_id_rename.rb
@@ -3,6 +3,8 @@
class CleanupApplicationSettingsSnowplowSiteIdRename < ActiveRecord::Migration[5.2]
include Gitlab::Database::MigrationHelpers
+ DOWNTIME = false
+
disable_ddl_transaction!
def up
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index bcf7405a7113a..0d3f2880ef245 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1798,6 +1798,9 @@ msgstr ""
msgid "Any user"
msgstr ""
+msgid "App ID"
+msgstr ""
+
msgid "Appearance"
msgstr ""
@@ -15596,9 +15599,6 @@ msgstr ""
msgid "Single or combined queries"
msgstr ""
-msgid "Site ID"
-msgstr ""
-
msgid "Size"
msgstr ""
--
GitLab