Add latest changes from gitlab-org/gitlab@master

3 files changed, 24 insertions, 1 deletions

diff --git a/db/migrate/20210209232508_add_markdown_surround_selection_to_user_preferences.rb b/db/migrate/20210209232508_add_markdown_surround_selection_to_user_preferences.rb
new file mode 100644
index 00000000000..c4063a55d18
--- /dev/null
+++ b/db/migrate/20210209232508_add_markdown_surround_selection_to_user_preferences.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddMarkdownSurroundSelectionToUserPreferences < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      add_column :user_preferences, :markdown_surround_selection, :boolean, default: true, null: false
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :user_preferences, :markdown_surround_selection, :boolean
+    end
+  end
+end
diff --git a/db/schema_migrations/20210209232508 b/db/schema_migrations/20210209232508
new file mode 100644
index 00000000000..d424fff0469
--- /dev/null
+++ b/db/schema_migrations/20210209232508
@@ -0,0 +1 @@
+484751de711e873e0f0f22d5951e36bf60d4826ebc95afa45e4f6cdaa0e3c024
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 38f79b4810f..7d10a327477 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -17928,7 +17928,8 @@ CREATE TABLE user_preferences (
     tab_width smallint,
     experience_level smallint,
     view_diffs_file_by_file boolean DEFAULT false NOT NULL,
-    gitpod_enabled boolean DEFAULT false NOT NULL
+    gitpod_enabled boolean DEFAULT false NOT NULL,
+    markdown_surround_selection boolean DEFAULT true NOT NULL
 );
 
 CREATE SEQUENCE user_preferences_id_seq