diff options
| author | Dan Davison <ddavison@gitlab.com> | 2019-02-21 22:23:02 +0300 |
|---|---|---|
| committer | Dan Davison <ddavison@gitlab.com> | 2019-02-21 22:23:02 +0300 |
| commit | 0b846d7c550827795918c5b43ffc2d8709a2c4c7 (patch) | |
| tree | 24fc40e09e7f0202eb37170e38acf6d868e525e2 /app/views | |
| parent | cd401a589e292180ca7233fe5687ec2ff404faa2 (diff) | |
| parent | 5ae46fe7a5f4e3327de4d2b1bd1830308176901d (diff) | |
Merge branch '57930-create-smoke-test-for-autodevops' into 'master'
Resolve "Create smoke test for AutoDevOps"
Closes #57930
See merge request gitlab-org/gitlab-ce!25442
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 69a47faabed..9c2efd6aa35 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -23,7 +23,7 @@ - if @pipeline.queued_duration = "(queued for #{time_interval_in_words(@pipeline.queued_duration)})" - .well-segment + .well-segment.qa-pipeline-badges .icon-container = sprite_icon('flag') - if @pipeline.latest? diff --git a/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml b/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml index 422be28737c..755fd3a17d3 100644 --- a/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml +++ b/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml @@ -1,5 +1,5 @@ - if show_auto_devops_implicitly_enabled_banner?(project, current_user) - .auto-devops-implicitly-enabled-banner.alert.alert-warning + .qa-auto-devops-banner.auto-devops-implicitly-enabled-banner.alert.alert-warning - more_information_link = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank', class: 'alert-link' - auto_devops_message = s_("AutoDevOps|The Auto DevOps pipeline has been enabled and will be used if no alternative CI configuration file is found. %{more_information_link}") % { more_information_link: more_information_link } = auto_devops_message.html_safe |