From ceffdf97151fb1feafdfa63ef04fb6c7d6d6e27d Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Wed, 18 Oct 2017 10:24:55 +0100 Subject: Decreases z-index of select2 to a lower number of our navigation bar --- app/assets/stylesheets/framework/selects.scss | 5 +++++ changelogs/unreleased/36160-zindex.yml | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 changelogs/unreleased/36160-zindex.yml 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/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 -- cgit v1.2.1 From fca91e610f3b0a80f7257362de7d22fc80d78fc8 Mon Sep 17 00:00:00 2001 From: Pedro Moreira da Silva Date: Wed, 18 Oct 2017 12:31:41 +0100 Subject: Fix tooltip padding to align to 8px grid --- app/assets/stylesheets/framework/tooltips.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.1 From a5cc1c261371b501791fc250801503f64b47fb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 17 Oct 2017 16:12:00 +0200 Subject: Improve the gitlab:dev:ee_compat_check task to pass a repo URL without credentials MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- lib/tasks/gitlab/dev.rake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1 From 0139b318f1419bf5266ed68ded04415361ead4eb Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Wed, 18 Oct 2017 16:03:38 +0100 Subject: Prevent ApplicationHelper specs from polluting later ones We don't want the locale to be set to Brazilian Portuguese for any subsequent specs! --- spec/helpers/application_helper_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- cgit v1.2.1