diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-02 10:43:06 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-09 21:13:08 +0800 |
| commit | 4ee08b77bc5ae11553d59c182ea8292b77699115 (patch) | |
| tree | 3aac1871cd8dcefc88d52f11dcacbf238b2340a9 /spec/services/merge_requests/conflicts | |
| parent | 612f5e63b3cf76c354e50f4aa6c4163e5465b115 (diff) | |
| download | gitlab-ce-4ee08b77bc5ae11553d59c182ea8292b77699115.tar.gz | |
Updates from `rubocop -a`
Diffstat (limited to 'spec/services/merge_requests/conflicts')
| -rw-r--r-- | spec/services/merge_requests/conflicts/list_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/conflicts/list_service_spec.rb b/spec/services/merge_requests/conflicts/list_service_spec.rb index 97da8a88660..a5520e7373e 100644 --- a/spec/services/merge_requests/conflicts/list_service_spec.rb +++ b/spec/services/merge_requests/conflicts/list_service_spec.rb @@ -34,7 +34,7 @@ describe MergeRequests::Conflicts::ListService do it 'returns a falsey value when the MR does not support new diff notes' do merge_request = create_merge_request('conflict-resolvable') - merge_request.merge_request_diff.update_attributes(start_commit_sha: nil) + merge_request.merge_request_diff.update(start_commit_sha: nil) expect(conflicts_service(merge_request).can_be_resolved_in_ui?).to be_falsey end |