diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-21 13:48:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-21 13:48:12 +0000 |
| commit | 0430b7644101fc70ed4be6bf69ccf05b900f4cdf (patch) | |
| tree | 3ea258c4da6e0f9c6e0f7523191fdb0a64a15c73 /lib/gitlab/conflict | |
| parent | 78ee24ba53a4a44d829613495ec0d5f1bbb5a9ee (diff) | |
| download | gitlab-ce-0430b7644101fc70ed4be6bf69ccf05b900f4cdf.tar.gz | |
Enable Style/DotPosition Rubocop :cop:
Diffstat (limited to 'lib/gitlab/conflict')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index 6e73361cad1..1611eba31da 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -16,9 +16,9 @@ module Gitlab project = merge_request.source_project new(merge_request, project).tap do |file_collection| - project. - repository. - with_repo_branch_commit(merge_request.target_project.repository, merge_request.target_branch) do + project + .repository + .with_repo_branch_commit(merge_request.target_project.repository, merge_request.target_branch) do yield file_collection end |