Add latest changes from gitlab-org/gitlab@master

6 files changed, 26 insertions, 70 deletions

diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index ccb58706fe0..cf0aafc2eb0 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -395,24 +395,22 @@ export default {
         :full-path="fullPath"
         @error="updateError = $event"
       />
-      <template v-if="workItemsMvc2Enabled">
-        <work-item-labels
-          v-if="workItemLabels"
-          :work-item-id="workItem.id"
-          :can-update="canUpdate"
-          :full-path="fullPath"
-          @error="updateError = $event"
-        />
-        <work-item-due-date
-          v-if="workItemDueDate"
-          :can-update="canUpdate"
-          :due-date="workItemDueDate.dueDate"
-          :start-date="workItemDueDate.startDate"
-          :work-item-id="workItem.id"
-          :work-item-type="workItemType"
-          @error="updateError = $event"
-        />
-      </template>
+      <work-item-labels
+        v-if="workItemLabels"
+        :work-item-id="workItem.id"
+        :can-update="canUpdate"
+        :full-path="fullPath"
+        @error="updateError = $event"
+      />
+      <work-item-due-date
+        v-if="workItemDueDate"
+        :can-update="canUpdate"
+        :due-date="workItemDueDate.dueDate"
+        :start-date="workItemDueDate.startDate"
+        :work-item-id="workItem.id"
+        :work-item-type="workItemType"
+        @error="updateError = $event"
+      />
       <work-item-weight
         v-if="workItemWeight"
         class="gl-mb-5"
diff --git a/app/assets/stylesheets/page_bundles/pipeline_schedules.scss b/app/assets/stylesheets/page_bundles/pipeline_schedules.scss
index c10d824339b..af2dac7739e 100644
--- a/app/assets/stylesheets/page_bundles/pipeline_schedules.scss
+++ b/app/assets/stylesheets/page_bundles/pipeline_schedules.scss
@@ -75,55 +75,8 @@
   }
 }
 
-.interval-pattern-form-group {
-  label {
-    margin-right: 10px;
-    font-weight: $gl-font-weight-normal;
-
-    &[for='custom'] {
-      margin-right: 0;
-    }
-  }
-
-  .cron-interval-input-wrapper {
-    padding-left: 0;
-  }
-
-  .cron-interval-input {
-    margin: 10px 10px 0 0;
-  }
-}
-
 .pipeline-schedule-table-row {
-  .branch-name-cell {
-    max-width: 300px;
-  }
-
   a {
     color: var(--gl-text-color, $gl-text-color);
   }
-
-  svg {
-    vertical-align: middle;
-  }
-}
-
-.pipeline-schedules-user-callout {
-  .bordered-box.content-block {
-    border: 1px solid var(--border-color, $border-color);
-    background-color: transparent;
-  }
-}
-
-.cron-preset-radio-input {
-  display: inline-block;
-
-  @include media-breakpoint-down(md) {
-    display: block;
-    margin: 0 0 5px 5px;
-  }
-
-  input {
-    margin-right: 3px;
-  }
 }
diff --git a/app/controllers/projects/protected_refs_controller.rb b/app/controllers/projects/protected_refs_controller.rb
index abbfe9ce22a..69a540158c6 100644
--- a/app/controllers/projects/protected_refs_controller.rb
+++ b/app/controllers/projects/protected_refs_controller.rb
@@ -4,7 +4,6 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
   include RepositorySettingsRedirect
 
   # Authorize
-  before_action :require_non_empty_project
   before_action :authorize_admin_project!
   before_action :load_protected_ref, only: [:show, :update, :destroy]
 
diff --git a/app/graphql/resolvers/projects/branch_rules_resolver.rb b/app/graphql/resolvers/projects/branch_rules_resolver.rb
index 6c8b416bcea..e99d7ae4d5f 100644
--- a/app/graphql/resolvers/projects/branch_rules_resolver.rb
+++ b/app/graphql/resolvers/projects/branch_rules_resolver.rb
@@ -3,13 +3,17 @@
 module Resolvers
   module Projects
     class BranchRulesResolver < BaseResolver
+      include LooksAhead
+
       type Types::Projects::BranchRuleType.connection_type, null: false
 
       alias_method :project, :object
 
-      def resolve(**args)
-        project.protected_branches
+      def resolve_with_lookahead(**args)
+        apply_lookahead(project.protected_branches)
       end
     end
   end
 end
+
+Resolvers::Projects::BranchRulesResolver.prepend_mod_with('Resolvers::Projects::BranchRulesResolver')
diff --git a/app/graphql/types/projects/branch_rule_type.rb b/app/graphql/types/projects/branch_rule_type.rb
index 1b0a080bd5d..e7632c17cca 100644
--- a/app/graphql/types/projects/branch_rule_type.rb
+++ b/app/graphql/types/projects/branch_rule_type.rb
@@ -38,3 +38,5 @@ module Types
     end
   end
 end
+
+Types::Projects::BranchRuleType.prepend_mod
diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
index 811297c9738..7b16564dfa2 100644
--- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
+++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
@@ -4,9 +4,9 @@
       = pipeline_schedule.description
     %td.branch-name-cell.gl-text-truncate
       - if pipeline_schedule.for_tag?
-        = sprite_icon('tag', size: 12)
+        = sprite_icon('tag', size: 12, css_class: 'gl-vertical-align-middle!' )
       - else
-        = sprite_icon('fork', size: 12)
+        = sprite_icon('fork', size: 12, css_class: 'gl-vertical-align-middle!')
       - if pipeline_schedule.ref.present?
         = link_to pipeline_schedule.ref_for_display, project_ref_path(@project, pipeline_schedule.ref_for_display), class: "ref-name"
     %td