diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-02-11 13:14:11 -0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-02-25 10:41:01 -0300 |
| commit | 105212ce49007ffc3489c2039e55056d8df8fa95 (patch) | |
| tree | 32593345a1a0aa88e2c71fc057e8e835744084a3 /app/services/merge_requests/merge_base_service.rb | |
| parent | 1ad699677fa4b24a9bc002c6dc20164b8832bca5 (diff) | |
| download | gitlab-ce-105212ce49007ffc3489c2039e55056d8df8fa95.tar.gz | |
Check authorization in merge services
Move authorization checks to merge services
instead relying solely on external checks.
Diffstat (limited to 'app/services/merge_requests/merge_base_service.rb')
| -rw-r--r-- | app/services/merge_requests/merge_base_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/merge_requests/merge_base_service.rb b/app/services/merge_requests/merge_base_service.rb index 4c5a0d96957..61049f394aa 100644 --- a/app/services/merge_requests/merge_base_service.rb +++ b/app/services/merge_requests/merge_base_service.rb @@ -27,6 +27,10 @@ module MergeRequests private + def raise_error(message) + raise MergeError, message + end + def handle_merge_error(*args) # No-op end |