Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 2 deletions

diff --git a/db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb b/db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb
index 8de8b3bcc2e..21d7f50ee83 100644
--- a/db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb
+++ b/db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb
@@ -6,7 +6,7 @@ class CreateMissingNamespaceForInternalUsers < ActiveRecord::Migration[4.2]
       create_namespace(id, username)
       # When testing locally I've noticed that these internal users are missing
       # the notification email, for more details visit the below link:
-      # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18357#note_68327560
+      # https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/18357#note_68327560
       set_notification_email(id)
     end
   end
diff --git a/db/migrate/20190801193427_rename_application_settings_snowplow_collector_uri_column.rb b/db/migrate/20190801193427_rename_application_settings_snowplow_collector_uri_column.rb
index a4bd5841a46..fba9849d3eb 100644
--- a/db/migrate/20190801193427_rename_application_settings_snowplow_collector_uri_column.rb
+++ b/db/migrate/20190801193427_rename_application_settings_snowplow_collector_uri_column.rb
@@ -12,6 +12,6 @@ class RenameApplicationSettingsSnowplowCollectorUriColumn < ActiveRecord::Migrat
   end
 
   def down
-    cleanup_concurrent_column_rename :application_settings, :snowplow_collector_hostname, :snowplow_collector_uri
+    undo_rename_column_concurrently :application_settings, :snowplow_collector_uri, :snowplow_collector_hostname
   end
 end
diff --git a/db/migrate/20190918104212_add_merge_request_metrics_merged_at_index.rb b/db/migrate/20190918104212_add_merge_request_metrics_merged_at_index.rb
new file mode 100644
index 00000000000..9db4e42f3ee
--- /dev/null
+++ b/db/migrate/20190918104212_add_merge_request_metrics_merged_at_index.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddMergeRequestMetricsMergedAtIndex < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :merge_request_metrics, [:merged_at, :id]
+  end
+
+  def down
+    remove_concurrent_index :merge_request_metrics, [:merged_at, :id]
+  end
+end