summaryrefslogtreecommitdiff
path: root/spec/support/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 18:06:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 18:06:14 +0000
commitc792263edfaf826c58f4aa41d26904464a17a3e7 (patch)
treeb57ae96c9eeaf0a1432a29f7f50f2fce9529818d /spec/support/helpers
parent6f9edd1a4c4942d3d13ec54793cfae56164b1a0a (diff)
downloadgitlab-ce-c792263edfaf826c58f4aa41d26904464a17a3e7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/helpers')
-rw-r--r--spec/support/helpers/repo_helpers.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/helpers/repo_helpers.rb b/spec/support/helpers/repo_helpers.rb
index b5defba332a..255a15b1ab0 100644
--- a/spec/support/helpers/repo_helpers.rb
+++ b/spec/support/helpers/repo_helpers.rb
@@ -92,7 +92,7 @@ eos
)
end
- def sample_compare
+ def sample_compare(extra_changes = [])
changes = [
{
line_code: 'a5cc2925ca8258af241be7e5b0381edf30266302_20_20',
@@ -102,7 +102,7 @@ eos
line_code: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44_4_6',
file_path: '.gitmodules'
}
- ]
+ ] + extra_changes
commits = %w(
5937ac0a7beb003549fc5fd26fc247adbce4a52e