diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-07 00:42:39 +0900 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-23 17:11:49 +0900 |
| commit | f8d6e81b92e85663bead6036e80407d7ab55a643 (patch) | |
| tree | 2d75864afbe8bde0263590cf97dcf2857c84b60b /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | 617292046cf69ff4a41da875fe67f0ce7f612ea3 (diff) | |
| download | gitlab-ce-f8d6e81b92e85663bead6036e80407d7ab55a643.tar.gz | |
Fix rubocop anger
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 433dbdb37bf..2cbb46d8274 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1183,13 +1183,13 @@ describe Projects::MergeRequestsController do context 'when accessing status' do before do create(:ci_pipeline, project: merge_request.source_project, - ref: merge_request.source_branch, - sha: merge_request.diff_head_sha, - status: 'success') + ref: merge_request.source_branch, + sha: merge_request.diff_head_sha, + status: 'success') get :status, namespace_id: project.namespace, - project_id: project, - id: merge_request.iid, - format: :json + project_id: project, + id: merge_request.iid, + format: :json end it 'returns pipeline status via PipelineSerializer' do |