Commit f6325757 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix invalid constant names related to git operations

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 0313235b
......@@ -864,7 +864,7 @@ class Repository
raise 'Invalid merge target' if our_commit.nil?
raise 'Invalid merge source' if their_commit.nil?
GitOperationService.new(user, self).with_branch(target_branch) do |start_commit|
Gitlab::Git::OperationService.new(user, raw_repository).with_branch(target_branch) do |start_commit|
merge_request&.update(in_progress_merge_commit_sha: their_commit.oid)
their_commit.oid
......
......@@ -50,7 +50,7 @@ module Projects
else
begin
repository.ff_merge(current_user, upstream_branch.dereferenced_target, name)
rescue Gitlab::Git::HooksService::PreReceiveError, Repository::CommitError => e
rescue Gitlab::Git::HooksService::PreReceiveError, Gitlab::Git::CommitError => e
errors << e.message
end
end
......
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