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

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'