diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-06 15:18:58 +0300 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-11 11:51:15 +0300 |
commit | 8ad9c4e873f2185e8bbfa6f363db32dbbba27141 (patch) | |
tree | cefefd09ed7f5b03307f31d240f7a20d757ac185 /app/views/projects/merge_requests/index.html.haml | |
parent | ec43e3644436e0ae90f6fb6a64256c38ceb68cc9 (diff) |
Rename `create_merge_request` permissions
So we can distinguish between the permissions on the source and the
target project.
- `create_merge_request_from` indicates a user can create a merge
request with the project as a source_project
- `create_merge_request_in` indicates a user can create a merge
request with the project as a target_project
Diffstat (limited to 'app/views/projects/merge_requests/index.html.haml')
-rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index b2c0d9e1cfa..f9ab0f5709b 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -1,6 +1,6 @@ - @no_container = true - @can_bulk_update = can?(current_user, :admin_merge_request, @project) -- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project)) +- merge_project = can?(current_user, :create_merge_request_from, @project) ? @project : (current_user && current_user.fork_of(@project)) - new_merge_request_path = project_new_merge_request_path(merge_project) if merge_project - page_title "Merge Requests" |