diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-05 17:01:04 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-05 17:01:04 +0000 |
| commit | 0a30a9ea595530499e2d3ae8062506b0a94eebad (patch) | |
| tree | b1a43be9495da0f4f3402324c853a9c39b637484 /app | |
| parent | bfb32b46327576f5b5d4ff3d42198ba4601f1830 (diff) | |
| parent | 6e0efbb096eb7042ad14fa2263c036009b80a678 (diff) | |
| download | gitlab-ce-0a30a9ea595530499e2d3ae8062506b0a94eebad.tar.gz | |
Merge branch '42684-set-up-ci-set-up-ci-cd' into 'master'
Resolve "`Set up CI` => `Set up CI/CD`"
Closes #42684
See merge request gitlab-org/gitlab-ce!16870
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index d3e867e124c..888d820b04e 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -47,7 +47,7 @@ - if @repository.gitlab_ci_yml %li - = link_to _('CI configuration'), ci_configuration_path(@project) + = link_to _('CI/CD configuration'), ci_configuration_path(@project) - if current_user && can_push_branch?(@project, @project.default_branch) - unless @repository.changelog @@ -65,7 +65,7 @@ - unless @repository.gitlab_ci_yml %li.missing = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do - #{ _('Set up CI') } + #{ _('Set up CI/CD') } - if koding_enabled? && @repository.koding_yml.blank? %li.missing = link_to _('Set up Koding'), add_koding_stack_path(@project) |