From 8ad9c4e873f2185e8bbfa6f363db32dbbba27141 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Fri, 6 Apr 2018 14:18:58 +0200 Subject: 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 --- app/controllers/projects/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/application_controller.rb') diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index cbb14b55399..53a0c712e49 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -35,7 +35,7 @@ class Projects::ApplicationController < ApplicationController project ||= @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) || -- cgit v1.2.1