summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-18 09:15:23 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-18 09:15:23 +0000
commitdb74db6eb68deb92dfe59427c38999f8ba49bfb5 (patch)
tree4503a6616fc49112dcc8bd5253becf6fadbbc010
parentf937ac867de9c70aaba5b541f6ebfe0461c28b4d (diff)
parentb53994bb9e4a8f3c2a18725ecbb152cc6463f5d8 (diff)
downloadgitlab-ce-db74db6eb68deb92dfe59427c38999f8ba49bfb5.tar.gz
Merge branch 'fix-ci-settings-cancel' into 'master'
Remove Cancel button from CI Project settings Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/2568 See merge request !1337
-rw-r--r--app/views/ci/projects/_form.html.haml1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/ci/projects/_form.html.haml b/app/views/ci/projects/_form.html.haml
index d50e1a83b06..e782fd8a0f7 100644
--- a/app/views/ci/projects/_form.html.haml
+++ b/app/views/ci/projects/_form.html.haml
@@ -96,6 +96,5 @@
.form-actions
= f.submit 'Save changes', class: 'btn btn-save'
- = link_to 'Cancel', projects_path, class: 'btn'
- unless @project.new_record?
= link_to 'Remove Project', ci_project_path(@project), method: :delete, data: { confirm: 'Project will be removed. Are you sure?' }, class: 'btn btn-danger pull-right'