diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-10 21:43:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-10 21:43:34 +0000 |
| commit | cb2f739d4844af094f62edb4e4dff1b3413a405b (patch) | |
| tree | c86ea111756a89d84e0601d554ddc78d3be780d0 /app/models/repository.rb | |
| parent | 000045e6647fd8c2e28b1a6dc12ce59f9bfc054f (diff) | |
| parent | 3db37e05622aa3daa2be41bb9edc486cd2e54bcd (diff) | |
| download | gitlab-ce-cb2f739d4844af094f62edb4e4dff1b3413a405b.tar.gz | |
Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
Resolve "Use consistent style for trailing commas"
Closes #27144
See merge request !11063
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 0c36a9e8762..9d9d94c4486 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) |