Add latest changes from gitlab-org/gitlab@master

9 files changed, 31 insertions, 16 deletions

diff --git a/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue b/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue
index 13e9cb096ee..35a8d3d979a 100644
--- a/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue
+++ b/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue
@@ -9,6 +9,7 @@ import { getBulkImportsHistory } from '~/rest_api';
 import ImportStatus from '~/import_entities/components/import_status.vue';
 import PaginationBar from '~/vue_shared/components/pagination_bar/pagination_bar.vue';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
+import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
 
 import { DEFAULT_ERROR } from '../utils/error_messages';
 
@@ -16,6 +17,8 @@ const DEFAULT_PER_PAGE = 20;
 const DEFAULT_TH_CLASSES =
   'gl-bg-transparent! gl-border-b-solid! gl-border-b-gray-200! gl-border-b-1! gl-p-5!';
 
+const HISTORY_PAGINATION_SIZE_PERSIST_KEY = 'gl-bulk-imports-history-per-page';
+
 const tableCell = (config) => ({
   thClass: `${DEFAULT_TH_CLASSES}`,
   tdClass: (value, key, item) => {
@@ -37,6 +40,7 @@ export default {
     PaginationBar,
     ImportStatus,
     TimeAgo,
+    LocalStorageSync,
   },
 
   data() {
@@ -85,10 +89,13 @@ export default {
         this.loadHistoryItems();
       },
       deep: true,
-      immediate: true,
     },
   },
 
+  mounted() {
+    this.loadHistoryItems();
+  },
+
   methods: {
     async loadHistoryItems() {
       try {
@@ -116,6 +123,7 @@ export default {
   },
 
   gitlabLogo: window.gon.gitlab_logo,
+  historyPaginationSizePersistKey: HISTORY_PAGINATION_SIZE_PERSIST_KEY,
 };
 </script>
 
@@ -171,5 +179,9 @@ export default {
         @set-page-size="paginationConfig.perPage = $event"
       />
     </template>
+    <local-storage-sync
+      v-model="paginationConfig.perPage"
+      :storage-key="$options.historyPaginationSizePersistKey"
+    />
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
index 7d1b80826ae..ec7a7cd72ae 100644
--- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
@@ -139,7 +139,7 @@ export default {
       <div
         class="gl-p-2 flex-shrink-1 gl-display-flex gl-flex-direction-column align-items-center gl-w-70p"
       >
-        <user-avatar-image :img-src="user.avatarUrl" :size="64" css-classes="gl-mr-3!" />
+        <user-avatar-image :img-src="user.avatarUrl" :size="64" css-classes="gl-m-0!" />
         <div v-if="shouldRenderToggleFollowButton" class="gl-mt-3">
           <gl-button
             :variant="toggleFollowButtonVariant"
@@ -151,7 +151,7 @@ export default {
           >
         </div>
       </div>
-      <div class="gl-w-full gl-min-w-0">
+      <div class="gl-w-full gl-min-w-0 gl-word-break-word">
         <template v-if="userIsLoading">
           <gl-skeleton-loader
             :lines="$options.maxSkeletonLines"
@@ -174,7 +174,7 @@ export default {
           <div class="gl-text-gray-500">
             <div v-if="user.bio" class="gl-display-flex gl-mb-2">
               <gl-icon name="profile" class="gl-flex-shrink-0" />
-              <span ref="bio" class="gl-ml-2 gl-overflow-hidden">{{ user.bio }}</span>
+              <span ref="bio" class="gl-ml-2">{{ user.bio }}</span>
             </div>
             <div v-if="user.workInformation" class="gl-display-flex gl-mb-2">
               <gl-icon name="work" class="gl-flex-shrink-0" />
diff --git a/app/graphql/types/ci/config/include_type_enum.rb b/app/graphql/types/ci/config/include_type_enum.rb
index 4a2ac90c77b..328824ae996 100644
--- a/app/graphql/types/ci/config/include_type_enum.rb
+++ b/app/graphql/types/ci/config/include_type_enum.rb
@@ -9,7 +9,7 @@ module Types
 
         value 'remote', description: 'Remote include.', value: :remote
         value 'local', description: 'Local include.', value: :local
-        value 'project', description: 'Project include.', value: :project
+        value 'file', description: 'Project file include.', value: :file
         value 'template', description: 'Template include.', value: :template
       end
     end
diff --git a/app/helpers/tracking_helper.rb b/app/helpers/tracking_helper.rb
index 1beb88548c5..9ef57a57d62 100644
--- a/app/helpers/tracking_helper.rb
+++ b/app/helpers/tracking_helper.rb
@@ -2,7 +2,7 @@
 
 module TrackingHelper
   def tracking_attrs(label, action, property)
-    return {} unless tracking_enabled?
+    return {} unless ::Gitlab::Tracking.enabled?
 
     {
       data: {
@@ -16,11 +16,4 @@ module TrackingHelper
   def tracking_attrs_data(label, action, property)
     tracking_attrs(label, action, property).fetch(:data, {})
   end
-
-  private
-
-  def tracking_enabled?
-    Rails.env.production? &&
-      ::Gitlab::Tracking.enabled?
-  end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 027b2257f2e..524bb072810 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -53,7 +53,6 @@ class Project < ApplicationRecord
 
   ignore_columns :mirror_last_update_at, :mirror_last_successful_update_at, remove_after: '2021-09-22', remove_with: '14.4'
   ignore_columns :pull_mirror_branch_prefix, remove_after: '2021-09-22', remove_with: '14.4'
-  ignore_columns :build_coverage_regex, remove_after: '2022-07-22', remove_with: '15.0'
 
   STATISTICS_ATTRIBUTE = 'repositories_count'
   UNKNOWN_IMPORT_URL = 'http://unknown.git'
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 878e42172b7..ee6f204be45 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -203,6 +203,12 @@ module MergeRequests
       target_branch.blank? || target_project.commit(target_branch)
     end
 
+    def set_draft_title_if_needed
+      return unless compare_commits.empty? || Gitlab::Utils.to_boolean(params[:draft])
+
+      merge_request.title = wip_title
+    end
+
     # When your branch name starts with an iid followed by a dash this pattern will be
     # interpreted as the user wants to close that issue on this project.
     #
@@ -220,7 +226,7 @@ module MergeRequests
       assign_title_and_description_from_commits
       merge_request.title ||= title_from_issue if target_project.issues_enabled? || target_project.external_issue_tracker
       merge_request.title ||= source_branch.titleize.humanize
-      merge_request.title = wip_title if compare_commits.empty?
+      set_draft_title_if_needed
 
       append_closes_description
     end
diff --git a/app/services/merge_requests/push_options_handler_service.rb b/app/services/merge_requests/push_options_handler_service.rb
index 2b81967b1e3..076fe8c3b21 100644
--- a/app/services/merge_requests/push_options_handler_service.rb
+++ b/app/services/merge_requests/push_options_handler_service.rb
@@ -126,6 +126,7 @@ module MergeRequests
       params = {
         title: push_options[:title],
         description: push_options[:description],
+        draft: push_options[:draft],
         target_branch: push_options[:target],
         force_remove_source_branch: push_options[:remove_source_branch],
         label: push_options[:label],
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 391079223ca..6e8afaecbba 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -11,6 +11,10 @@ module MergeRequests
     end
 
     def execute(merge_request)
+      if Gitlab::Utils.to_boolean(params[:draft])
+        merge_request.title = merge_request.draft_title
+      end
+
       update_merge_request_with_specialized_service(merge_request) || general_fallback(merge_request)
     end
 
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index 5238c712a41..8b186935a4d 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -14,7 +14,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _("Customize your pipeline configuration and coverage report.")
+      = _("Customize your pipeline configuration.")
   .settings-content
     = render 'form'