diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-01-05 23:41:17 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-01-05 23:41:17 +0300 |
| commit | dea589d635d4c41fbf0db721b132ea466c34cb4a (patch) | |
| tree | dc8d37aa2e1cd6c8df9c5488d03b8479772a5852 /app | |
| parent | a30f278bdee399346f199ada0e33f5c2d233d861 (diff) | |
Prefer leading dots over trailing dots
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 | ||||
| -rw-r--r-- | app/services/commits/change_service.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 7946d8e123e..00c2a3695af 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -169,8 +169,8 @@ class MergeRequestDiff < ActiveRecord::Base # When compare merge request versions we want diff A..B instead of A...B # so we handle cases when user does squash and rebase of the commits between versions. # For this reason we set straight to true by default. - CompareService.new(project, head_commit_sha). - execute(project, sha, straight: straight) + CompareService.new(project, head_commit_sha) + .execute(project, sha, straight: straight) end def commits_count diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb index 4a5d8029413..8d1dfbcea7d 100644 --- a/app/services/commits/change_service.rb +++ b/app/services/commits/change_service.rb @@ -70,8 +70,8 @@ module Commits # Temporary branch exists and contains the change commit return if repository.find_branch(new_branch) - result = ValidateNewBranchService.new(@project, current_user). - execute(new_branch) + result = ValidateNewBranchService.new(@project, current_user) + .execute(new_branch) if result[:status] == :error raise ChangeError, "There was an error creating the source branch: #{result[:message]}" |