diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 16:26:06 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 16:26:06 +0300 |
commit | 5af7e8422bdff28fff3cde6cf31a0c6fde21918b (patch) | |
tree | c74a137f4bb9e9c5135445be1ee2e8812b78bdf4 /app/presenters/merge_request_presenter.rb | |
parent | 86be4a6f466205b415de74330dd495a2e8b3c9d0 (diff) | |
parent | 579fa8b8ec7eb38d40c96521f517c9dab8c3b97a (diff) |
Merge branch 'gt-fix-styling-for-pages-status' into 'master'
Fix styling for `app/assets/stylesheets/pages/status.scss`
Closes #59929
See merge request gitlab-org/gitlab-ce!26875
Diffstat (limited to 'app/presenters/merge_request_presenter.rb')
-rw-r--r-- | app/presenters/merge_request_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index e4a62deda7a..0c5369ba32c 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -13,7 +13,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated def ci_status if pipeline status = pipeline.status - status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings? + status = "success-with-warnings" if pipeline.success? && pipeline.has_warnings? status || "preparing" else |