diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-27 10:52:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-27 10:52:04 +0000 |
| commit | fe60079454cd2d59ea53d81660836fd3c697c4fb (patch) | |
| tree | 250989b0af28e4553de0ac4d3ce1113a5df4b7de /app | |
| parent | 5db934372b713e9939c3809af9b0100cd318d0fc (diff) | |
| parent | db8ee6672cf49a2eed4e244080246f21a9e14dd9 (diff) | |
| download | gitlab-ce-fe60079454cd2d59ea53d81660836fd3c697c4fb.tar.gz | |
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 e33182c357f..80d4081dd7b 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 } |