diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2022-08-30 17:44:39 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2022-08-30 17:44:39 +0300 |
| commit | c8fd9c521b89b98797cfd6e3a51cae6955129c20 (patch) | |
| tree | 100aa740075c645ab256c399981d84c2be394187 /app/helpers | |
| parent | 6e8c2290dab8ae1612dff80e312911bc1147edaa (diff) | |
| parent | e5a7085d4340afe6badbf6d5a808ad409cba35f2 (diff) | |
Merge remote-tracking branch 'dev/15-3-stable' into 15-3-stable
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/commits_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/labels_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 1920650bc93..4493bc2bc6d 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -171,7 +171,7 @@ module CommitsHelper ref, { merge_request: merge_request&.cache_key, - pipeline_status: commit.status_for(ref)&.cache_key, + pipeline_status: commit.detailed_status_for(ref)&.cache_key, xhr: request.xhr?, controller: controller.controller_path, path: @path # referred to in #link_to_browse_code diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index 2d0bc1bc63f..e865db128c1 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -247,7 +247,7 @@ module LabelsHelper class="#{css_class}" data-container="body" data-html="true" - #{"style=\"background-color: #{bg_color}\"" if bg_color} + #{"style=\"background-color: #{h bg_color}\"" if bg_color} >#{ERB::Util.html_escape_once(name)}#{suffix}</span> HTML end |