diff options
Diffstat (limited to 'app/services/merge_requests/rebase_service.rb')
| -rw-r--r-- | app/services/merge_requests/rebase_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/merge_requests/rebase_service.rb b/app/services/merge_requests/rebase_service.rb index 4d36dd4feae..7e9442c0c7c 100644 --- a/app/services/merge_requests/rebase_service.rb +++ b/app/services/merge_requests/rebase_service.rb @@ -1,9 +1,13 @@ # frozen_string_literal: true module MergeRequests - class RebaseService < MergeRequests::WorkingCopyBaseService + class RebaseService < MergeRequests::BaseService + include Git::Logger + REBASE_ERROR = 'Rebase failed. Please rebase locally' + attr_reader :merge_request + def execute(merge_request) @merge_request = merge_request |