diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-05 15:12:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-05 15:12:35 +0000 |
| commit | 7c3c901ada6fc4a6d2d3ce7a2cf8188cf6615008 (patch) | |
| tree | 20ce6767a9ce239b893b64fbf04d815b79f98686 /app/views/projects/merge_requests | |
| parent | 9b1270280a65cc39c8dd908a12f8dbc7847ec971 (diff) | |
| parent | edd2ce38369e5a332b1b9932647d670862ffddbf (diff) | |
| download | gitlab-ce-7c3c901ada6fc4a6d2d3ce7a2cf8188cf6615008.tar.gz | |
Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master'
Show 'New Merge Request' buttons on canonical repo. (by @joshfng)
Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners.
See merge request !2300
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 086298e5af1..8d5d0394a82 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -6,9 +6,10 @@ .controls = render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project) - - if can? current_user, :create_merge_request, @project + - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project)) + - if merge_project .pull-left.hidden-xs - = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-new", title: "New Merge Request" do + = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New Merge Request" do %i.fa.fa-plus New Merge Request = render 'shared/issuable/filter', type: :merge_requests |