diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-03 02:26:35 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-03 02:26:35 +0300 |
| commit | e7d530a624fbb8854047c3983eaa0972a19f36c8 (patch) | |
| tree | 92f77913a359ccf4078cf010add02d8b8f765490 /spec/models/cycle_analytics | |
| parent | dce77b1d6d5e2b82441a685d385ee809c6b35b76 (diff) | |
| parent | 54fca95160389fe7993df5d82635b83804833fee (diff) | |
Merge branch 'fix-git-hooks-when-creating-file' into 'master'
Don't execute git hooks if you create branch as part of other change
Closes #23439
See merge request !7237
Diffstat (limited to 'spec/models/cycle_analytics')
| -rw-r--r-- | spec/models/cycle_analytics/production_spec.rb | 8 | ||||
| -rw-r--r-- | spec/models/cycle_analytics/staging_spec.rb | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/spec/models/cycle_analytics/production_spec.rb b/spec/models/cycle_analytics/production_spec.rb index 2cbee741fb0..b9fe492fe2c 100644 --- a/spec/models/cycle_analytics/production_spec.rb +++ b/spec/models/cycle_analytics/production_spec.rb @@ -21,7 +21,13 @@ describe 'CycleAnalytics#production', feature: true do ["production deploy happens after merge request is merged (along with other changes)", lambda do |context, data| # Make other changes on master - sha = context.project.repository.commit_file(context.user, context.random_git_name, "content", "commit message", 'master', false) + sha = context.project.repository.commit_file( + context.user, + context.random_git_name, + 'content', + message: 'commit message', + branch_name: 'master', + update: false) context.project.repository.commit(sha) context.deploy_master diff --git a/spec/models/cycle_analytics/staging_spec.rb b/spec/models/cycle_analytics/staging_spec.rb index 104e65335dd..9a024d533a1 100644 --- a/spec/models/cycle_analytics/staging_spec.rb +++ b/spec/models/cycle_analytics/staging_spec.rb @@ -29,10 +29,10 @@ describe 'CycleAnalytics#staging', feature: true do sha = context.project.repository.commit_file( context.user, context.random_git_name, - "content", - "commit message", - 'master', - false) + 'content', + message: 'commit message', + branch_name: 'master', + update: false) context.project.repository.commit(sha) context.deploy_master |