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/presenters | |
| 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/presenters')
| -rw-r--r-- | app/presenters/merge_request_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index 950d3fde2ea..a55af1422e8 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -197,7 +197,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated def user_can_collaborate_with_project? can_create_merge_request = - can?(current_user, :create_merge_request_in_project, project) && + can?(current_user, :create_merge_request_in, project) && current_user.already_forked?(project) can?(current_user, :push_code, project) || |