Merge branch 'ci-deprecate-dumped-yaml' into 'master'
Remove deprecated dumped yaml file generated from previous job definitions See merge request !1777
This commit is contained in:
commit
8ab5df9d87
4 changed files with 1 additions and 24 deletions
|
@ -30,6 +30,7 @@ v 8.2.0 (unreleased)
|
|||
- Rename "Back to" links to "Go to" because its not always a case it point to place user come from
|
||||
- Allow groups to appear in the search results if the group owner allows it
|
||||
- New design for project graphs page
|
||||
- Remove deprecated dumped yaml file generated from previous job definitions
|
||||
- Fix incoming email config defaults
|
||||
- MR target branch is now visible on a list view when it is different from project's default one
|
||||
- Improve Continuous Integration graphs page
|
||||
|
|
|
@ -26,10 +26,6 @@ module Ci
|
|||
redirect_to namespace_project_runners_path(project.gl_project.namespace, project.gl_project)
|
||||
end
|
||||
|
||||
def dumped_yaml
|
||||
send_data @project.generated_yaml_config, filename: '.gitlab-ci.yml'
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def project
|
||||
|
|
|
@ -1,25 +1,6 @@
|
|||
- page_title "CI Settings"
|
||||
- if @ci_project.generated_yaml_config
|
||||
%p.alert.alert-danger
|
||||
CI Jobs are deprecated now, you can #{link_to "download", dumped_yaml_ci_project_path(@ci_project)}
|
||||
or
|
||||
%a.preview-yml{:href => "#yaml-content", "data-toggle" => "modal"} preview
|
||||
yaml file which is based on your old jobs.
|
||||
Put this file to the root of your project and name it .gitlab-ci.yml
|
||||
|
||||
- if no_runners_for_project?(@ci_project)
|
||||
= render 'no_runners'
|
||||
|
||||
= render 'form'
|
||||
|
||||
- if @ci_project.generated_yaml_config
|
||||
#yaml-content.modal.fade{"aria-hidden" => "true", "aria-labelledby" => ".gitlab-ci.yml", :role => "dialog", :tabindex => "-1"}
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
%button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
|
||||
%h4.modal-title Content of .gitlab-ci.yml
|
||||
.modal-body
|
||||
= text_area_tag :yaml, @ci_project.generated_yaml_config, size: "70x25", class: "form-control"
|
||||
.modal-footer
|
||||
%button.btn.btn-default{"data-dismiss" => "modal", :type => "button"} Close
|
||||
|
|
|
@ -32,7 +32,6 @@ Gitlab::Application.routes.draw do
|
|||
get :status, to: 'projects#badge'
|
||||
get :integration
|
||||
post :toggle_shared_runners
|
||||
get :dumped_yaml
|
||||
end
|
||||
|
||||
resources :runner_projects, only: [:create, :destroy]
|
||||
|
|
Loading…
Reference in a new issue