Add latest changes from gitlab-org/gitlab@master

8 files changed, 39 insertions, 22 deletions

diff --git a/app/assets/javascripts/pages/projects/merge_requests/index/index.js b/app/assets/javascripts/pages/projects/merge_requests/index/index.js
index b3a09cc0be3..af75c05b300 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/index/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/index/index.js
@@ -5,7 +5,6 @@ import { FILTERED_SEARCH } from '~/filtered_search/constants';
 import { initBulkUpdateSidebar, initCsvImportExportButtons, initIssuableByEmail } from '~/issuable';
 import { ISSUABLE_INDEX } from '~/issuable/constants';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
-import UsersSelect from '~/users_select';
 
 initBulkUpdateSidebar(ISSUABLE_INDEX.MERGE_REQUEST);
 
@@ -18,7 +17,6 @@ initFilteredSearch({
   useDefaultState: true,
 });
 
-new UsersSelect(); // eslint-disable-line no-new
 new ShortcutsNavigation(); // eslint-disable-line no-new
 
 initIssuableByEmail();
diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
index eb48732f558..3bc65e02ce4 100644
--- a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
+++ b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
@@ -235,7 +235,7 @@ export default {
     help: __('Help'),
     learnMore: __('Learn more'),
   },
-  dateHelpUrl: '/help/user/group/epics/index.md#start-date-and-due-date',
+  dateHelpUrl: '/help/user/group/epics/manage_epics.md#start-and-due-date-inheritance',
 };
 </script>
 
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue
index c52d5ee6e08..6003aa40c6d 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue
@@ -97,6 +97,23 @@ export default {
       type: Boolean,
       required: true,
     },
+    /**
+     * A button is composed of the following properties:
+     *
+     * {
+     *   "id": string,
+     *   "href": string,
+     *   "dataMethod": string,
+     *   "dataClipboardText": string,
+     *   "icon": string,
+     *   "variant": string,
+     *   "loading": boolean,
+     *   "testId":string,
+     *   "text": string,
+     *   "class": string | Object,
+     *   "fullReport": boolean,
+     * }
+     */
     actionButtons: {
       type: Array,
       required: false,
diff --git a/app/graphql/types/ci/runner_upgrade_status_enum.rb b/app/graphql/types/ci/runner_upgrade_status_enum.rb
index 34a931c8f79..668970aaff2 100644
--- a/app/graphql/types/ci/runner_upgrade_status_enum.rb
+++ b/app/graphql/types/ci/runner_upgrade_status_enum.rb
@@ -5,13 +5,13 @@ module Types
     class RunnerUpgradeStatusEnum < BaseEnum
       graphql_name 'CiRunnerUpgradeStatus'
 
+      MODEL_STATUS_TO_GRAPHQL_TRANSLATIONS = {
+        invalid_version: :invalid,
+        unavailable: :not_available
+      }.freeze
+
       ::Ci::RunnerVersion::STATUS_DESCRIPTIONS.each do |status, description|
-        status_name_src =
-          if status == :invalid_version
-            :invalid
-          else
-            status
-          end
+        status_name_src = MODEL_STATUS_TO_GRAPHQL_TRANSLATIONS.fetch(status, status)
 
         value status_name_src.to_s.upcase, description: description, value: status
       end
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb
index 60796e628a3..46777ad16d0 100644
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
@@ -91,6 +91,15 @@ module NamespacesHelper
     }
   end
 
+  def storage_usage_app_data(namespace)
+    {
+      namespace_id: namespace.id,
+      namespace_path: namespace.full_path,
+      user_namespace: namespace.user_namespace?.to_s,
+      default_per_page: page_size
+    }
+  end
+
   private
 
   # Many importers create a temporary Group, so use the real
diff --git a/app/models/ci/runner_version.rb b/app/models/ci/runner_version.rb
index 7b26bd8d80e..ec42f46b165 100644
--- a/app/models/ci/runner_version.rb
+++ b/app/models/ci/runner_version.rb
@@ -8,26 +8,23 @@ module Ci
     enum_with_nil status: {
       not_processed: nil,
       invalid_version: -1,
-      not_available: 1,
+      unavailable: 1,
       available: 2,
       recommended: 3
     }
 
     STATUS_DESCRIPTIONS = {
       invalid_version: 'Runner version is not valid.',
-      not_available: 'Upgrade is not available for the runner.',
+      unavailable: 'Upgrade is not available for the runner.',
       available: 'Upgrade is available for the runner.',
       recommended: 'Upgrade is available and recommended for the runner.'
     }.freeze
 
     has_many :runner_machines, inverse_of: :runner_version, foreign_key: :version, class_name: 'Ci::RunnerMachine'
 
-    # Override auto generated negative scope (from available) so the scope has expected behavior
-    scope :not_available, -> { where(status: :not_available) }
-
     # This scope returns all versions that might need recalculating. For instance, once a version is considered
     # :recommended, it normally doesn't change status even if the instance is upgraded
-    scope :potentially_outdated, -> { where(status: [nil, :not_available, :available]) }
+    scope :potentially_outdated, -> { where(status: [nil, :unavailable, :available]) }
 
     validates :version, length: { maximum: 2048 }
   end
diff --git a/app/models/release.rb b/app/models/release.rb
index 85699d259f5..0f00732b62e 100644
--- a/app/models/release.rb
+++ b/app/models/release.rb
@@ -25,7 +25,7 @@ class Release < ApplicationRecord
   before_create :set_released_at
 
   validates :project, :tag, presence: true
-  validates :author_id, presence: true, on: :create, if: :validate_release_with_author?
+  validates :author_id, presence: true, on: :create
 
   validates :tag, uniqueness: { scope: :project_id }
 
@@ -118,10 +118,6 @@ class Release < ApplicationRecord
     end
   end
 
-  def validate_release_with_author?
-    Feature.enabled?(:validate_release_with_author, self.project)
-  end
-
   def set_released_at
     self.released_at ||= created_at
   end
diff --git a/app/views/search/_results_status.html.haml b/app/views/search/_results_status.html.haml
index af65ac0d1a8..27405631360 100644
--- a/app/views/search/_results_status.html.haml
+++ b/app/views/search/_results_status.html.haml
@@ -3,12 +3,12 @@
 .search-results-status
   .gl-display-flex.gl-flex-direction-column
     .gl-p-5.gl-display-flex
-      .gl-md-display-flex.gl-text-left.gl-align-items-center.gl-flex-grow-1
+      .gl-md-display-flex.gl-text-left.gl-align-items-center.gl-flex-grow-1.gl-white-space-nowrap.gl-max-w-full
         - unless @search_service_presenter.without_count?
           = search_entries_info(@search_objects, @scope, @search_term)
         - unless @search_service_presenter.show_snippets?
           - if @project
-            - link_to_project = link_to(@project.full_name, @project, class: 'ml-md-1')
+            - link_to_project = link_to(@project.full_name, @project, class: 'ml-md-1 gl-text-truncate search-wrap-f-md-down')
             - if @scope == 'blobs'
               = _("in")
               .mx-md-1