diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 18:21:45 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 18:21:45 +0100 |
commit | d66c48b303b00b731540dfa928ea151295ced5d4 (patch) | |
tree | 48001cbfb4f8d0e96bf210df93a2e96d8cbf7805 /app/services/merge_requests/rebase_service.rb | |
parent | f40373329f34b56647945522fccad3202ceafcde (diff) | |
parent | 3d162d192ba2a57776de62b553a2a0a9a9245f8a (diff) | |
download | gitlab-ce-d66c48b303b00b731540dfa928ea151295ced5d4.tar.gz |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'app/services/merge_requests/rebase_service.rb')
-rw-r--r-- | app/services/merge_requests/rebase_service.rb | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/app/services/merge_requests/rebase_service.rb b/app/services/merge_requests/rebase_service.rb new file mode 100644 index 00000000000..0d5a25fa28e --- /dev/null +++ b/app/services/merge_requests/rebase_service.rb @@ -0,0 +1,30 @@ +module MergeRequests + class RebaseService < MergeRequests::WorkingCopyBaseService + def execute(merge_request) + @merge_request = merge_request + + if rebase + success + else + error('Failed to rebase. Should be done manually') + end + end + + def rebase + if merge_request.rebase_in_progress? + log_error('Rebase task canceled: Another rebase is already in progress', save_message_on_model: true) + return false + end + + rebase_sha = repository.rebase(current_user, merge_request) + + merge_request.update_attributes(rebase_commit_sha: rebase_sha) + + true + rescue => e + log_error('Failed to rebase branch:') + log_error(e.message, save_message_on_model: true) + false + end + end +end |