diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-06 14:18:58 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-11 10:51:15 +0200 |
| commit | 8ad9c4e873f2185e8bbfa6f363db32dbbba27141 (patch) | |
| tree | cefefd09ed7f5b03307f31d240f7a20d757ac185 /app/services/merge_requests | |
| parent | ec43e3644436e0ae90f6fb6a64256c38ceb68cc9 (diff) | |
| download | gitlab-ce-8ad9c4e873f2185e8bbfa6f363db32dbbba27141.tar.gz | |
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/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/create_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 4c2c8398461..fe1ac70781e 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -71,8 +71,8 @@ module MergeRequests params.delete(:source_project_id) params.delete(:target_project_id) - unless can?(current_user, :read_project, @source_project) && - can?(current_user, :create_merge_request_in_project, @project) + unless can?(current_user, :create_merge_request_from, @source_project) && + can?(current_user, :create_merge_request_in, @project) raise Gitlab::Access::AccessDeniedError end |