Add latest changes from gitlab-org/gitlab@master

7 files changed, 45 insertions, 16 deletions

diff --git a/app/assets/javascripts/autosave.js b/app/assets/javascripts/autosave.js
index 07d79ea1c70..5f50fcc112e 100644
--- a/app/assets/javascripts/autosave.js
+++ b/app/assets/javascripts/autosave.js
@@ -3,7 +3,7 @@
 import AccessorUtilities from './lib/utils/accessor';
 
 export default class Autosave {
-  constructor(field, key, fallbackKey) {
+  constructor(field, key, fallbackKey, lockVersion) {
     this.field = field;
 
     this.isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe();
@@ -12,6 +12,8 @@ export default class Autosave {
     }
     this.key = `autosave/${key}`;
     this.fallbackKey = fallbackKey;
+    this.lockVersionKey = `${this.key}/lockVersion`;
+    this.lockVersion = lockVersion;
     this.field.data('autosave', this);
     this.restore();
     this.field.on('input', () => this.save());
@@ -40,6 +42,11 @@ export default class Autosave {
     }
   }
 
+  getSavedLockVersion() {
+    if (!this.isLocalStorageAvailable) return;
+    return window.localStorage.getItem(this.lockVersionKey);
+  }
+
   save() {
     if (!this.field.length) return;
 
@@ -49,6 +56,9 @@ export default class Autosave {
       if (this.fallbackKey) {
         window.localStorage.setItem(this.fallbackKey, text);
       }
+      if (this.lockVersion !== undefined) {
+        window.localStorage.setItem(this.lockVersionKey, this.lockVersion);
+      }
       return window.localStorage.setItem(this.key, text);
     }
 
@@ -58,6 +68,7 @@ export default class Autosave {
   reset() {
     if (!this.isLocalStorageAvailable) return;
 
+    window.localStorage.removeItem(this.lockVersionKey);
     window.localStorage.removeItem(this.fallbackKey);
     return window.localStorage.removeItem(this.key);
   }
diff --git a/app/assets/javascripts/snippets/components/snippet_blob_view.vue b/app/assets/javascripts/snippets/components/snippet_blob_view.vue
index 02a0fc7686d..d615eaadb78 100644
--- a/app/assets/javascripts/snippets/components/snippet_blob_view.vue
+++ b/app/assets/javascripts/snippets/components/snippet_blob_view.vue
@@ -75,6 +75,7 @@ export default {
         <template #actions>
           <clone-dropdown-button
             v-if="canBeCloned"
+            class="mr-2"
             :ssh-link="snippet.sshUrlToRepo"
             :http-link="snippet.httpUrlToRepo"
           />
diff --git a/app/assets/javascripts/static_site_editor/index.js b/app/assets/javascripts/static_site_editor/index.js
index 15d668fd431..fe5d11f1bd9 100644
--- a/app/assets/javascripts/static_site_editor/index.js
+++ b/app/assets/javascripts/static_site_editor/index.js
@@ -1,14 +1,14 @@
 import Vue from 'vue';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import StaticSiteEditor from './components/static_site_editor.vue';
 import createStore from './store';
 
 const initStaticSiteEditor = el => {
-  const { projectId, path: sourcePath, returnUrl } = el.dataset;
-  const isSupportedContent = 'isSupportedContent' in el.dataset;
+  const { isSupportedContent, projectId, path: sourcePath, returnUrl } = el.dataset;
 
   const store = createStore({
     initialState: {
-      isSupportedContent,
+      isSupportedContent: parseBoolean(isSupportedContent),
       projectId,
       returnUrl,
       sourcePath,
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index 37f9bdc8fa4..69253b55188 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -12,7 +12,7 @@ class Projects::RefsController < Projects::ApplicationController
   before_action :authorize_download_code!
 
   before_action only: [:logs_tree] do
-    push_frontend_feature_flag(:vue_file_list_lfs_badge)
+    push_frontend_feature_flag(:vue_file_list_lfs_badge, default_enabled: true)
   end
 
   def switch
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index b8fe2a47b30..9cb345724cc 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -16,7 +16,7 @@ class Projects::TreeController < Projects::ApplicationController
   before_action :authorize_edit_tree!, only: [:create_dir]
 
   before_action only: [:show] do
-    push_frontend_feature_flag(:vue_file_list_lfs_badge)
+    push_frontend_feature_flag(:vue_file_list_lfs_badge, default_enabled: true)
   end
 
   def show
diff --git a/app/models/resource_milestone_event.rb b/app/models/resource_milestone_event.rb
index a40af22061e..a0655c3a4ab 100644
--- a/app/models/resource_milestone_event.rb
+++ b/app/models/resource_milestone_event.rb
@@ -25,4 +25,8 @@ class ResourceMilestoneEvent < ResourceEvent
   def self.issuable_attrs
     %i(issue merge_request).freeze
   end
+
+  def milestone_title
+    milestone&.title
+  end
 end
diff --git a/app/services/issuable/clone/attributes_rewriter.rb b/app/services/issuable/clone/attributes_rewriter.rb
index 55f5629baac..78d3fb2e4d2 100644
--- a/app/services/issuable/clone/attributes_rewriter.rb
+++ b/app/services/issuable/clone/attributes_rewriter.rb
@@ -67,22 +67,30 @@ module Issuable
       end
 
       def copy_resource_milestone_events
-        entity_key = new_entity.class.name.underscore.foreign_key
+        return unless milestone_events_supported?
 
         copy_events(ResourceMilestoneEvent.table_name, original_entity.resource_milestone_events) do |event|
-          matching_destination_milestone = matching_milestone(event.milestone.title)
-
-          if matching_destination_milestone.present?
-            event.attributes
-              .except('id')
-              .merge(entity_key => new_entity.id,
-                     'milestone_id' => matching_destination_milestone.id,
-                     'action' => ResourceMilestoneEvent.actions[event.action],
-                     'state' => ResourceMilestoneEvent.states[event.state])
+          if event.remove?
+            event_attributes_with_milestone(event, nil)
+          else
+            matching_destination_milestone = matching_milestone(event.milestone_title)
+
+            event_attributes_with_milestone(event, matching_destination_milestone) if matching_destination_milestone.present?
           end
         end
       end
 
+      def event_attributes_with_milestone(event, milestone)
+        entity_key = new_entity.class.name.underscore.foreign_key
+
+        event.attributes
+          .except('id')
+          .merge(entity_key => new_entity.id,
+                 'milestone_id' => milestone&.id,
+                 'action' => ResourceMilestoneEvent.actions[event.action],
+                 'state' => ResourceMilestoneEvent.states[event.state])
+      end
+
       def copy_events(table_name, events_to_copy)
         events_to_copy.find_in_batches do |batch|
           events = batch.map do |event|
@@ -96,6 +104,11 @@ module Issuable
       def entity_key
         new_entity.class.name.parameterize('_').foreign_key
       end
+
+      def milestone_events_supported?
+        original_entity.respond_to?(:resource_milestone_events) &&
+          new_entity.respond_to?(:resource_milestone_events)
+      end
     end
   end
 end