diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 00:09:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 00:09:06 +0300 |
| commit | a7d1db72c912ef512c25724392f1c903e8d3bd7e (patch) | |
| tree | 15c9ca0c24a94aff8ca33cdd2212f9a2997d5571 | |
| parent | 33795139ea8e72756bee3675b4e16387425e6ab1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/helpers/labels_helper.rb | 8 | ||||
| -rw-r--r-- | spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js (renamed from spec/javascripts/create_cluster/gke_cluster/stores/mutations_spec.js) | 0 | ||||
| -rw-r--r-- | spec/lib/gitlab/ci/yaml_processor_spec.rb | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index 0d3cf4d73fb..91127df318e 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -2,7 +2,6 @@ module LabelsHelper extend self - include ActionView::Helpers::TagHelper def show_label_issuables_link?(label, issuables_type, current_user: nil) return true unless label.project_label? @@ -64,8 +63,8 @@ module LabelsHelper # by LabelReferenceFilter span = %(<span class="badge color-label #{"has-tooltip" if tooltip}" ) + %(data-html="true" style="background-color: #{label.color}; color: #{text_color}" ) + - %(title="#{escape_once(title)}" data-container="body">) + - %(#{escape_once(label.name)}#{label_suffix}</span>) + %(title="#{ERB::Util.html_escape_once(title)}" data-container="body">) + + %(#{ERB::Util.html_escape_once(label.name)}#{label_suffix}</span>) span.html_safe end @@ -247,9 +246,6 @@ module LabelsHelper def issuable_types ['issues', 'merge requests'] end - - # Required for Banzai::Filter::LabelReferenceFilter - module_function :render_colored_label, :text_color_for_bg, :escape_once, :label_tooltip_title end LabelsHelper.prepend_if_ee('EE::LabelsHelper') diff --git a/spec/javascripts/create_cluster/gke_cluster/stores/mutations_spec.js b/spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js index 7ee6ff436e2..7ee6ff436e2 100644 --- a/spec/javascripts/create_cluster/gke_cluster/stores/mutations_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb index e81aeb620c3..cfc3d852de0 100644 --- a/spec/lib/gitlab/ci/yaml_processor_spec.rb +++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb @@ -101,6 +101,7 @@ module Gitlab name: "rspec", only: { refs: %w[branches tags] }, options: { script: ["rspec"] }, + scheduling_type: :stage, tag_list: %w[A B], allow_failure: false, when: "on_success", |