diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
| commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
| tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /lib/gitlab/git | |
| parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) | |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/keep_around.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/git/keep_around.rb b/lib/gitlab/git/keep_around.rb index b6fc335c979..38f0e47c4c7 100644 --- a/lib/gitlab/git/keep_around.rb +++ b/lib/gitlab/git/keep_around.rb @@ -19,7 +19,7 @@ module Gitlab end def execute(shas) - shas.each do |sha| + shas.uniq.each do |sha| next unless sha.present? && commit_by(oid: sha) next if kept_around?(sha) diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index bc15bd367d8..473bc04661c 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -870,9 +870,9 @@ module Gitlab end end - def squash(user, squash_id, start_sha:, end_sha:, author:, message:) + def squash(user, start_sha:, end_sha:, author:, message:) wrapped_gitaly_errors do - gitaly_operation_client.user_squash(user, squash_id, start_sha, end_sha, author, message) + gitaly_operation_client.user_squash(user, start_sha, end_sha, author, message) end end |