diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-17 07:35:20 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-17 07:35:20 +0000 |
commit | 6cbc20512cd8f062f4a6745b839c5f2921ac6d63 (patch) | |
tree | 319f5b93f715cef37852f4d29cc8a1a5f3533886 /app/views/ci | |
parent | 32fc0a259c50bd80e94dfd22e12179a4e69f8ddc (diff) | |
parent | 04a164c2dc3d186bc8e600df5d790eba535b610b (diff) | |
download | gitlab-ce-6cbc20512cd8f062f4a6745b839c5f2921ac6d63.tar.gz |
Merge branch 'fix-ci-500-on-settings' into 'master'
Fix 500 on CI project settings
Fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/2546
/cc @dzaporozhets
See merge request !1321
Diffstat (limited to 'app/views/ci')
-rw-r--r-- | app/views/ci/projects/edit.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/ci/projects/edit.html.haml b/app/views/ci/projects/edit.html.haml index 79e8fd3a295..876ae5182d4 100644 --- a/app/views/ci/projects/edit.html.haml +++ b/app/views/ci/projects/edit.html.haml @@ -1,6 +1,6 @@ - if @project.generated_yaml_config %p.alert.alert-danger - CI Jobs are deprecated now, you can #{link_to "download", dumped_yaml_ci_project(@project)} + CI Jobs are deprecated now, you can #{link_to "download", dumped_yaml_ci_project_path(@project)} or %a.preview-yml{:href => "#yaml-content", "data-toggle" => "modal"} preview yaml file which is based on your old jobs. |