diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 17:22:26 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 17:22:26 +0300 |
| commit | 20c7144ed20bad499b878425d5fbab408ad066b5 (patch) | |
| tree | 8b25261fa12fc36abca7639664329724d2a4302d /spec/controllers | |
| parent | 8ce1896b46f893de62528e44172be8c128b27c9b (diff) | |
Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 8499bf07e9f..2a9ee881e98 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -250,7 +250,7 @@ describe Projects::MergeRequestsController do end before do - create(:ci_empty_commit, project: project, sha: merge_request.source_sha, ref: merge_request.source_branch) + create(:ci_empty_pipeline, project: project, sha: merge_request.source_sha, ref: merge_request.source_branch) end it 'returns :merge_when_build_succeeds' do |