diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /lib/gitlab/branch_push_merge_commit_analyzer.rb | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'lib/gitlab/branch_push_merge_commit_analyzer.rb')
| -rw-r--r-- | lib/gitlab/branch_push_merge_commit_analyzer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/branch_push_merge_commit_analyzer.rb b/lib/gitlab/branch_push_merge_commit_analyzer.rb index a8f601f2451..ddf2086363c 100644 --- a/lib/gitlab/branch_push_merge_commit_analyzer.rb +++ b/lib/gitlab/branch_push_merge_commit_analyzer.rb @@ -114,7 +114,7 @@ module Gitlab # If child commit is a direct ancestor, its first parent is also a direct ancestor. # We assume direct ancestors matches the trail of the target branch over time, # This assumption is correct most of the time, especially for gitlab managed merges, - # but there are exception cases which can't be solved (https://stackoverflow.com/a/49754723/474597) + # but there are exception cases which can't be solved. def mark_all_direct_ancestors(commit) loop do commit = get_commit(commit.parent_ids.first) |