diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-03 13:27:17 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-10 18:25:45 +0200 |
| commit | 3db37e05622aa3daa2be41bb9edc486cd2e54bcd (patch) | |
| tree | c32b151da8174e8a3c925dc2720ea8d47ee5d4cf /app/models/repository.rb | |
| parent | d40e1f547ea9e31e822229bb808aaa6b9201f473 (diff) | |
| download | gitlab-ce-3db37e05622aa3daa2be41bb9edc486cd2e54bcd.tar.gz | |
Enable the Style/TrailingCommaInArguments cop
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 0c797dd5814..0f645c9f1da 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -833,7 +833,7 @@ class Repository actual_options = options.merge( parents: [our_commit, their_commit], - tree: merge_index.write_tree(rugged), + tree: merge_index.write_tree(rugged) ) commit_id = create_commit(actual_options) |