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 | |
parent | f6f5cbbb7655f5950609ff6af7628a652a5b199c (diff) |
Merge branch 'auto-deploy-with-space' into 'master'
Rename "autodeploy" to "auto deploy"
Closes #25999
See merge request !8289
-rw-r--r-- | app/views/projects/show.html.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/auto-deploy-with-space.yml | 4 | ||||
-rw-r--r-- | doc/ci/README.md | 2 | ||||
-rw-r--r-- | doc/ci/autodeploy/img/auto_deploy_button.png | bin | 0 -> 43441 bytes | |||
-rw-r--r-- | doc/ci/autodeploy/img/auto_deploy_dropdown.png | bin | 0 -> 44380 bytes | |||
-rw-r--r-- | doc/ci/autodeploy/img/autodeploy_button.png | bin | 41799 -> 0 bytes | |||
-rw-r--r-- | doc/ci/autodeploy/img/autodeploy_dropdown.png | bin | 51420 -> 0 bytes | |||
-rw-r--r-- | doc/ci/autodeploy/index.md | 14 | ||||
-rw-r--r-- | lib/gitlab/template/gitlab_ci_yml_template.rb | 4 | ||||
-rw-r--r-- | spec/features/auto_deploy_spec.rb | 14 |
10 files changed, 23 insertions, 19 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 } diff --git a/changelogs/unreleased/auto-deploy-with-space.yml b/changelogs/unreleased/auto-deploy-with-space.yml new file mode 100644 index 00000000000..a206e3ae85c --- /dev/null +++ b/changelogs/unreleased/auto-deploy-with-space.yml @@ -0,0 +1,4 @@ +--- +title: Rename "autodeploy" to "auto deploy" +merge_request: +author: diff --git a/doc/ci/README.md b/doc/ci/README.md index 6a9495f8892..dd14698e9cd 100644 --- a/doc/ci/README.md +++ b/doc/ci/README.md @@ -23,7 +23,7 @@ - [CI/CD pipelines settings](../user/project/pipelines/settings.md) - [Review Apps](review_apps/index.md) - [Git submodules](git_submodules.md) Using Git submodules in your CI jobs -- [Autodeploy](autodeploy/index.md) +- [Auto deploy](autodeploy/index.md) ## Breaking changes diff --git a/doc/ci/autodeploy/img/auto_deploy_button.png b/doc/ci/autodeploy/img/auto_deploy_button.png Binary files differnew file mode 100644 index 00000000000..423e76a6cda --- /dev/null +++ b/doc/ci/autodeploy/img/auto_deploy_button.png diff --git a/doc/ci/autodeploy/img/auto_deploy_dropdown.png b/doc/ci/autodeploy/img/auto_deploy_dropdown.png Binary files differnew file mode 100644 index 00000000000..957870ec8c7 --- /dev/null +++ b/doc/ci/autodeploy/img/auto_deploy_dropdown.png diff --git a/doc/ci/autodeploy/img/autodeploy_button.png b/doc/ci/autodeploy/img/autodeploy_button.png Binary files differdeleted file mode 100644 index 9e2cd57a0ba..00000000000 --- a/doc/ci/autodeploy/img/autodeploy_button.png +++ /dev/null diff --git a/doc/ci/autodeploy/img/autodeploy_dropdown.png b/doc/ci/autodeploy/img/autodeploy_dropdown.png Binary files differdeleted file mode 100644 index d2733de83df..00000000000 --- a/doc/ci/autodeploy/img/autodeploy_dropdown.png +++ /dev/null diff --git a/doc/ci/autodeploy/index.md b/doc/ci/autodeploy/index.md index 9c79d8c457e..630207ffa09 100644 --- a/doc/ci/autodeploy/index.md +++ b/doc/ci/autodeploy/index.md @@ -1,8 +1,8 @@ -# Autodeploy +# Auto deploy > [Introduced][mr-8135] in GitLab 8.15. -Autodeploy is an easy way to configure GitLab CI for the deployment of your +Auto deploy is an easy way to configure GitLab CI for the deployment of your application. GitLab Community maintains a list of `.gitlab-ci.yml` templates for various infrastructure providers and deployment scripts powering them. These scripts are responsible for packaging your application, @@ -15,7 +15,7 @@ deployment. ## Supported templates -The list of supported autodeploy templates is available [here][autodeploy-templates]. +The list of supported auto deploy templates is available [here][auto-deploy-templates]. ## Configuration @@ -24,17 +24,17 @@ credentials. For example, if you want to deploy to OpenShift you have to enable [Kubernetes service][kubernetes-service]. 1. Configure GitLab Runner to use Docker or Kubernetes executor with [privileged mode enabled][docker-in-docker]. -1. Navigate to the "Project" tab and click "Set up autodeploy" button. - ![Autodeploy button](img/autodeploy_button.png) +1. Navigate to the "Project" tab and click "Set up auto deploy" button. + ![Auto deploy button](img/auto_deploy_button.png) 1. Select a template. - ![Dropdown with autodeploy templates](img/autodeploy_dropdown.png) + ![Dropdown with auto deploy templates](img/auto_deploy_dropdown.png) 1. Commit your changes and create a merge request. 1. Test your deployment configuration using a [Review App][review-app] that was created automatically for you. [mr-8135]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8135 [project-services]: ../../project_services/project_services.md -[autodeploy-templates]: https://gitlab.com/gitlab-org/gitlab-ci-yml/tree/master/autodeploy +[auto-deploy-templates]: https://gitlab.com/gitlab-org/gitlab-ci-yml/tree/master/autodeploy [kubernetes-service]: ../../project_services/kubernetes.md [docker-in-docker]: ../docker/using_docker_build.md#use-docker-in-docker-executor [review-app]: ../review_apps/index.md diff --git a/lib/gitlab/template/gitlab_ci_yml_template.rb b/lib/gitlab/template/gitlab_ci_yml_template.rb index d19b0a52043..9d2ecee9756 100644 --- a/lib/gitlab/template/gitlab_ci_yml_template.rb +++ b/lib/gitlab/template/gitlab_ci_yml_template.rb @@ -15,7 +15,7 @@ module Gitlab { 'General' => '', 'Pages' => 'Pages', - 'Autodeploy' => 'autodeploy' + 'Auto deploy' => 'autodeploy' } end @@ -28,7 +28,7 @@ module Gitlab end def dropdown_names(context) - categories = context == 'autodeploy' ? ['Autodeploy'] : ['General', 'Pages'] + categories = context == 'autodeploy' ? ['Auto deploy'] : ['General', 'Pages'] super().slice(*categories) end end diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb index 92f1ab90881..ea7a97d1d4f 100644 --- a/spec/features/auto_deploy_spec.rb +++ b/spec/features/auto_deploy_spec.rb @@ -26,7 +26,7 @@ describe 'Auto deploy' do it 'does not show a button to set up auto deploy' do visit namespace_project_path(project.namespace, project) - expect(page).to have_no_content('Set up autodeploy') + expect(page).to have_no_content('Set up auto deploy') end end @@ -37,11 +37,11 @@ describe 'Auto deploy' do end it 'shows a button to set up auto deploy' do - expect(page).to have_link('Set up autodeploy') + expect(page).to have_link('Set up auto deploy') end - it 'includes Kubernetes as an available template', js: true do - click_link 'Set up autodeploy' + it 'includes OpenShift as an available template', js: true do + click_link 'Set up auto deploy' click_button 'Choose a GitLab CI Yaml template' within '.gitlab-ci-yml-selector' do @@ -49,8 +49,8 @@ describe 'Auto deploy' do end end - it 'creates a merge request using "autodeploy" branch', js: true do - click_link 'Set up autodeploy' + it 'creates a merge request using "auto-deploy" branch', js: true do + click_link 'Set up auto deploy' click_button 'Choose a GitLab CI Yaml template' within '.gitlab-ci-yml-selector' do click_on 'OpenShift' @@ -58,7 +58,7 @@ describe 'Auto deploy' do wait_for_ajax click_button 'Commit Changes' - expect(page).to have_content('New Merge Request From autodeploy into master') + expect(page).to have_content('New Merge Request From auto-deploy into master') end end end |