Add latest changes from gitlab-org/gitlab@master

8 files changed, 11 insertions, 49 deletions

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index c2898aad512..1df9818a877 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -317,13 +317,6 @@
     }
   }
 
-  // Temporary fix to ensure tick is aligned
-  // Follow up Issue to remove after the GlNewDropdownItem component is fixed
-  // > https://gitlab.com/gitlab-org/gitlab/-/issues/213948
-  li:not(.gl-new-dropdown-item) .dropdown-item {
-    @include dropdown-link;
-  }
-
   .divider {
     height: 1px;
     margin: #{$grid-size / 2} 0;
@@ -384,6 +377,10 @@
   }
 }
 
+.dropdown-item {
+  @include dropdown-link;
+}
+
 .droplab-dropdown {
   .dropdown-toggle > i {
     pointer-events: none;
diff --git a/app/presenters/ci/build_runner_presenter.rb b/app/presenters/ci/build_runner_presenter.rb
index 33b7899f912..a409a3d7160 100644
--- a/app/presenters/ci/build_runner_presenter.rb
+++ b/app/presenters/ci/build_runner_presenter.rb
@@ -27,7 +27,7 @@ module Ci
     def git_depth
       if git_depth_variable
         git_depth_variable[:value]
-      elsif Feature.enabled?(:ci_project_git_depth, default_enabled: true)
+      else
         project.ci_default_git_depth
       end.to_i
     end
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index 00bf69739ad..5365c09eb25 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -89,8 +89,7 @@ module MergeRequests
     end
 
     def can_use_merge_request_ref?(merge_request)
-      Feature.enabled?(:ci_use_merge_request_ref, project, default_enabled: true) &&
-        !merge_request.for_fork?
+      !merge_request.for_fork?
     end
 
     def abort_auto_merge(merge_request, reason)
diff --git a/changelogs/unreleased/psi-dropdown-item-check.yml b/changelogs/unreleased/psi-dropdown-item-check.yml
new file mode 100644
index 00000000000..a39217d466d
--- /dev/null
+++ b/changelogs/unreleased/psi-dropdown-item-check.yml
@@ -0,0 +1,5 @@
+---
+title: Fix checkmark position on dropdowns
+merge_request: 30685
+author:
+type: fixed
diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
index fb5c7830ac2..4ca223204d5 100644
--- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
+++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
@@ -93,7 +93,6 @@ canceled.
 Can be caused by some disabled feature flags. Please make sure that
 the following feature flags are enabled on your GitLab instance:
 
-- `:ci_use_merge_request_ref`
 - `:merge_ref_auto_sync`
 
 To check and set these feature flag values, please ask an administrator to:
@@ -107,14 +106,12 @@ To check and set these feature flag values, please ask an administrator to:
 1. Check if the flags are enabled or not:
 
    ```ruby
-   Feature.enabled?(:ci_use_merge_request_ref)
    Feature.enabled?(:merge_ref_auto_sync)
    ```
 
 1. If needed, enable the feature flags:
 
    ```ruby
-   Feature.enable(:ci_use_merge_request_ref)
    Feature.enable(:merge_ref_auto_sync)
    ```
 
diff --git a/spec/presenters/ci/build_runner_presenter_spec.rb b/spec/presenters/ci/build_runner_presenter_spec.rb
index 0635c318942..28806a1c7e3 100644
--- a/spec/presenters/ci/build_runner_presenter_spec.rb
+++ b/spec/presenters/ci/build_runner_presenter_spec.rb
@@ -138,16 +138,6 @@ describe Ci::BuildRunnerPresenter do
     it 'defaults to git depth setting for the project' do
       expect(git_depth).to eq(build.project.ci_default_git_depth)
     end
-
-    context 'when feature flag :ci_project_git_depth is disabled' do
-      before do
-        stub_feature_flags(ci_project_git_depth: { enabled: false })
-      end
-
-      it 'defaults to 0' do
-        expect(git_depth).to eq(0)
-      end
-    end
   end
 
   describe '#refspecs' do
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index dc34546a599..9155db16d17 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -224,19 +224,6 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do
             end
           end
 
-          context 'when ci_use_merge_request_ref feature flag is false' do
-            before do
-              stub_feature_flags(ci_use_merge_request_ref: false)
-            end
-
-            it 'create legacy detached merge request pipeline for non-fork merge request' do
-              merge_request.reload
-
-              expect(merge_request.actual_head_pipeline)
-                .to be_legacy_detached_merge_request_pipeline
-            end
-          end
-
           context 'when there are no commits between source branch and target branch' do
             let(:opts) do
               {
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 4f052fa3edb..de7b933f89d 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -209,19 +209,6 @@ describe MergeRequests::RefreshService do
           end
         end
 
-        context 'when ci_use_merge_request_ref feature flag is false' do
-          before do
-            stub_feature_flags(ci_use_merge_request_ref: false)
-          end
-
-          it 'create legacy detached merge request pipeline for non-fork merge request' do
-            subject
-
-            expect(@merge_request.pipelines_for_merge_request.first)
-              .to be_legacy_detached_merge_request_pipeline
-          end
-        end
-
         context "when branch pipeline was created before a detaced merge request pipeline has been created" do
           before do
             create(:ci_pipeline, project: @merge_request.source_project,