WIP: Project option to require allow collaboration on merge requests
Closed
requested to merge prashcr/gitlab:project-option-to-require-allow-collaboration-on-merge-requests-squashed into master
4 unresolved threads
Compare changes
Files
12
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 15
− 13
@@ -167,6 +167,7 @@ def check_state?(merge_status)
@@ -167,6 +167,7 @@ def check_state?(merge_status)
@@ -666,18 +667,15 @@ def validate_fork
@@ -666,18 +667,15 @@ def validate_fork
errors.add :base, 'Target project requires merge requests to allow commits from members who can merge to the target branch'
@@ -834,7 +832,7 @@ def can_cancel_auto_merge?(current_user)
@@ -834,7 +832,7 @@ def can_cancel_auto_merge?(current_user)
@@ -1430,15 +1428,19 @@ def source_and_target_projects_not_private?
@@ -1430,15 +1428,19 @@ def source_and_target_projects_not_private?
@@ -1476,7 +1478,7 @@ def protected_source_branch?
@@ -1476,7 +1478,7 @@ def protected_source_branch?