Merge branch 'master' into 38869-dropzone-input38869-dropzone-input

* master:
  Prevent ApplicationHelper specs from polluting later ones
  Improve the gitlab:dev:ee_compat_check task to pass a repo URL without credentials
  Fix tooltip padding to align to 8px grid
  Decreases z-index of select2 to a lower number of our navigation bar

5 files changed, 17 insertions, 5 deletions

diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index 50f1445bc2e..621eec4f158 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -61,6 +61,11 @@
   border: 1px solid $dropdown-border-color;
   min-width: 175px;
   color: $gl-text-color;
+  z-index: 999;
+}
+
+.select2-drop-mask {
+  z-index: 998;
 }
 
 .select2-drop.select2-drop-above.select2-drop-active {
diff --git a/app/assets/stylesheets/framework/tooltips.scss b/app/assets/stylesheets/framework/tooltips.scss
index 93baf73cb78..98f28987a82 100644
--- a/app/assets/stylesheets/framework/tooltips.scss
+++ b/app/assets/stylesheets/framework/tooltips.scss
@@ -3,5 +3,5 @@
   border-radius: $border-radius-default;
   line-height: 16px;
   font-weight: $gl-font-weight-normal;
-  padding: $gl-btn-padding;
+  padding: 8px;
 }
diff --git a/changelogs/unreleased/36160-zindex.yml b/changelogs/unreleased/36160-zindex.yml
new file mode 100644
index 00000000000..a836744fb41
--- /dev/null
+++ b/changelogs/unreleased/36160-zindex.yml
@@ -0,0 +1,5 @@
+---
+title: Decreases z-index of select2 to a lower number of our navigation bar
+merge_request:
+author:
+type: fixed
diff --git a/lib/tasks/gitlab/dev.rake b/lib/tasks/gitlab/dev.rake
index b4d05f5995a..930b4bc13e2 100644
--- a/lib/tasks/gitlab/dev.rake
+++ b/lib/tasks/gitlab/dev.rake
@@ -5,7 +5,9 @@ namespace :gitlab do
       opts =
         if ENV['CI']
           {
-            ce_repo: ENV['CI_REPOSITORY_URL'],
+            # We don't use CI_REPOSITORY_URL since it includes `gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@`
+            # which is confusing in the steps suggested in the job's output.
+            ce_repo: "#{ENV['CI_PROJECT_URL']}.git",
             branch: ENV['CI_COMMIT_REF_NAME']
           }
         else
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 66785cf32da..7a241b02d28 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -312,9 +312,9 @@ describe ApplicationHelper do
 
   describe '#locale_path' do
     it 'returns the locale path with an `_`' do
-      Gitlab::I18n.locale = 'pt-BR'
-
-      expect(helper.locale_path).to include('assets/locale/pt_BR/app')
+      Gitlab::I18n.with_locale('pt-BR') do
+        expect(helper.locale_path).to include('assets/locale/pt_BR/app')
+      end
     end
   end
 end