diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-27 13:52:04 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2016-12-27 19:50:01 +0300 |
| commit | 18caf1ccb17d95e3471c335b8d2e965ac4251de7 (patch) | |
| tree | d0bdc4bf3f53c9a2908cb7b2572597de926fcc45 /app | |
| parent | f6f5cbbb7655f5950609ff6af7628a652a5b199c (diff) | |
Merge branch 'auto-deploy-with-space' into 'master'
Rename "autodeploy" to "auto deploy"
Closes #25999
See merge request !8289
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 a915c159cb4..f9776628c77 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -70,8 +70,8 @@ = link_to 'Set up Koding', add_koding_stack_path(@project) - if @repository.gitlab_ci_yml.blank? && @project.deployment_service.present? %li.missing - = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml', commit_message: 'Set up autodeploy', target_branch: 'autodeploy', context: 'autodeploy') do - Set up autodeploy + = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml', commit_message: 'Set up auto deploy', target_branch: 'auto-deploy', context: 'autodeploy') do + Set up auto deploy - if @repository.commit .project-last-commit{ class: container_class } |