diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-30 09:16:06 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-30 09:16:06 +0000 |
| commit | 42ac5c352b5517b2da4f75afb814aff9fddadeee (patch) | |
| tree | 388c71c7f1b069bb4e45b0d54cd8689a1551fd8b | |
| parent | 2d33952790ca07893f110ee1c46afcbce4da384b (diff) | |
| parent | 6cdbb1e687bcb787f749b51c472ec8449d0ca0e4 (diff) | |
| download | gitlab-ce-42ac5c352b5517b2da4f75afb814aff9fddadeee.tar.gz | |
Merge branch 'dm-empty-state-new-merge-request' into 'master'
Fix 'New merge request' button for users who don't have push access to canonical project
See merge request !12560
| -rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/dm-empty-state-new-merge-request.yml | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 86996e488a1..1e30cc09894 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -13,6 +13,9 @@ = render 'projects/last_push' +- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project)) +- new_merge_request_path = namespace_project_new_merge_request_path(merge_project.namespace, merge_project) if merge_project + - if @project.merge_requests.exists? %div{ class: container_class } .top-area @@ -20,9 +23,8 @@ .nav-controls - if @can_bulk_update = button_tag "Edit Merge Requests", class: "btn js-bulk-update-toggle" - - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project)) - if merge_project - = link_to namespace_project_new_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New merge request" do + = link_to new_merge_request_path, class: "btn btn-new", title: "New merge request" do New merge request = render 'shared/issuable/search_bar', type: :merge_requests @@ -33,4 +35,4 @@ .merge-requests-holder = render 'merge_requests' - else - = render 'shared/empty_states/merge_requests', button_path: namespace_project_new_merge_request_path(@project.namespace, @project) + = render 'shared/empty_states/merge_requests', button_path: new_merge_request_path diff --git a/changelogs/unreleased/dm-empty-state-new-merge-request.yml b/changelogs/unreleased/dm-empty-state-new-merge-request.yml new file mode 100644 index 00000000000..5fad7a0f883 --- /dev/null +++ b/changelogs/unreleased/dm-empty-state-new-merge-request.yml @@ -0,0 +1,5 @@ +--- +title: Fix 'New merge request' button for users who don't have push access to canonical + project +merge_request: +author: |