Commit 6280bcc0 authored by Robert Speicher's avatar Robert Speicher

Remove ShellEnv references from MergeRequests::RebaseService

parent dae964b2
...@@ -21,8 +21,6 @@ module MergeRequests ...@@ -21,8 +21,6 @@ module MergeRequests
end end
def rebase def rebase
Gitlab::ShellEnv.set_env(current_user)
if merge_request.rebase_in_progress? if merge_request.rebase_in_progress?
log('Rebase task canceled: Another rebase is already in progress') log('Rebase task canceled: Another rebase is already in progress')
return false return false
...@@ -61,7 +59,6 @@ module MergeRequests ...@@ -61,7 +59,6 @@ module MergeRequests
log(ex.message) log(ex.message)
ensure ensure
clean_dir clean_dir
Gitlab::ShellEnv.reset_env
end end
def source_project def source_project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment