summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-25 18:57:53 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-25 18:57:53 +0300
commitd6f04ad831d9ed2cd2b8b150df16332df0832a77 (patch)
tree78f4284e93e1db002d5faa617e931fffccbfe875 /app
parent74d4031bbe1a5c522879e4db644c9069d9cedb3e (diff)
parentae94f59bd5aa1dab41d00dd3c060c31b63d52cb6 (diff)
downloadgitlab-ce-d6f04ad831d9ed2cd2b8b150df16332df0832a77.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/merge_requests/_form.html.haml10
1 files changed, 0 insertions, 10 deletions
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 8ad47724fe7..154a01f59ad 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -1,14 +1,4 @@
= form_for [@project, @merge_request], html: { class: "merge-request-form form-horizontal" } do |f|
- .row
- .col-sm-2
- .col-sm-10
- - if @repository.contribution_guide && !@merge_request.persisted?
- - contribution_guide_url = project_blob_path(@project, tree_join(@repository.root_ref, @repository.contribution_guide.name))
- .alert.alert-info
- Please review the
- %strong #{link_to "guidelines for contribution", contribution_guide_url}
- to this repository.
-
.merge-request-form-info
= render 'projects/issuable_form', f: f, issuable: @merge_request
.form-group