diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-05-23 16:51:35 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-05-23 16:51:35 +0000 |
| commit | a2658b086afbeefea29ce3df61d707ed74602481 (patch) | |
| tree | a97a8ae584d5026e84dfabc3c3fc525698a3dcd5 /app | |
| parent | a352c0d584f0e72a9c825199297f60730221f7ee (diff) | |
| parent | bf8c6990b4ca8e259e6ec3030a677fbfec30377b (diff) | |
| download | gitlab-ce-a2658b086afbeefea29ce3df61d707ed74602481.tar.gz | |
Merge branch 'fix/devops-remove-beta' into 'master'
removed "(Beta)" from "Auto DevOps" messages
See merge request gitlab-org/gitlab-ce!18759
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/_ci_cd.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/empty.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_auto_devops_callout.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index b4d2a789df0..079f371e0ba 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -7,7 +7,7 @@ .checkbox = f.label :auto_devops_enabled do = f.check_box :auto_devops_enabled - Enabled Auto DevOps (Beta) for projects by default + Enabled Auto DevOps for projects by default .help-block It will automatically build, test, and deploy applications based on a predefined CI/CD configuration = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md') diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index a066f9f4cca..63fc5c6d05a 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -22,7 +22,7 @@ %hr %p - - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps (Beta)'), project_settings_ci_cd_path(@project, anchor: 'autodevops-settings')) + - link_to_auto_devops_settings = link_to(s_('AutoDevOps|enable Auto DevOps'), project_settings_ci_cd_path(@project, anchor: 'autodevops-settings')) - link_to_add_kubernetes_cluster = link_to(s_('AutoDevOps|add a Kubernetes cluster'), new_project_cluster_path(@project)) = s_('AutoDevOps|You can automatically build and test your application if you %{link_to_auto_devops_settings} for this project. You can automatically deploy it as well, if you %{link_to_add_kubernetes_cluster}.').html_safe % { link_to_auto_devops_settings: link_to_auto_devops_settings, link_to_add_kubernetes_cluster: link_to_add_kubernetes_cluster } diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 5f596a019f7..7d8dd58e7e0 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -19,7 +19,7 @@ %section.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) } .settings-header %h4 - = s_('CICD|Auto DevOps (Beta)') + = s_('CICD|Auto DevOps') %button.btn.btn-default.js-settings-toggle{ type: 'button' } = expanded ? _('Collapse') : _('Expand') %p diff --git a/app/views/shared/_auto_devops_callout.html.haml b/app/views/shared/_auto_devops_callout.html.haml index d3fa324e460..084d295f2c1 100644 --- a/app/views/shared/_auto_devops_callout.html.haml +++ b/app/views/shared/_auto_devops_callout.html.haml @@ -3,7 +3,7 @@ = custom_icon('icon_autodevops') .banner-body.prepend-left-10.append-bottom-10 - %h5.banner-title= s_('AutoDevOps|Auto DevOps (Beta)') + %h5.banner-title= s_('AutoDevOps|Auto DevOps') %p= s_('AutoDevOps|It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.') %p - link = link_to(s_('AutoDevOps|Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer') |