diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 7946d8e123e8203049f998147efba1a871733e67..00c2a3695afcbff05c3bdb94d2064bac1eda5ca4 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 4a5d80294133a181ed73aeebda13a6b55964f39c..8d1dfbcea7d6bcf7e0ccaaf9df50b019c0e68aa5 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]}"