diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-05-10 23:58:06 -0300 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-05-13 04:46:56 -0300 |
| commit | f5a0ac0fc197bae2eb5fe1045ed237cdbbaf6ea4 (patch) | |
| tree | 29c89f80adc403185f931966d49c67f830be842b /app/models/repository.rb | |
| parent | 311fb58c44fe6dd14709c8eb8f9346ec73e03aff (diff) | |
| download | gitlab-ce-f5a0ac0fc197bae2eb5fe1045ed237cdbbaf6ea4.tar.gz | |
Codestyle: make sure we have space around operators
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index de7e163078d..0eff74320f3 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -795,7 +795,7 @@ class Repository def check_revert_content(commit, base_branch) source_sha = find_branch(base_branch).target args = [commit.id, source_sha] - args << { mainline: 1 } if commit.merge_commit? + args << { mainline: 1 } if commit.merge_commit? revert_index = rugged.revert_commit(*args) return false if revert_index.conflicts? @@ -809,7 +809,7 @@ class Repository def check_cherry_pick_content(commit, base_branch) source_sha = find_branch(base_branch).target args = [commit.id, source_sha] - args << 1 if commit.merge_commit? + args << 1 if commit.merge_commit? cherry_pick_index = rugged.cherrypick_commit(*args) return false if cherry_pick_index.conflicts? |