diff options
| author | Rydkin Maxim <maks.rydkin@gmail.com> | 2016-12-16 01:14:20 +0300 |
|---|---|---|
| committer | Rydkin Maxim <maks.rydkin@gmail.com> | 2016-12-16 21:37:22 +0300 |
| commit | 170efaaba273792ddffc2806ef1501f33d87a5a2 (patch) | |
| tree | d193abbcb948cf989f848b83583a157719512caf /app/services/merge_requests | |
| parent | b1120fc3e702daac001d000263eac79f4629b595 (diff) | |
Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index bebfca7537b..6a7393a9921 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -42,7 +42,7 @@ module MergeRequests end if merge_request.source_project == merge_request.target_project && - merge_request.target_branch == merge_request.source_branch + merge_request.target_branch == merge_request.source_branch messages << 'You must select different branches' end diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index fda0da19d87..ad16ef8c70f 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -25,7 +25,7 @@ module MergeRequests end if merge_request.previous_changes.include?('title') || - merge_request.previous_changes.include?('description') + merge_request.previous_changes.include?('description') todo_service.update_merge_request(merge_request, current_user) end |