BigW Consortium Gitlab

Commit dea589d6 by Lin Jen-Shin

Prefer leading dots over trailing dots

parent a30f278b
...@@ -169,8 +169,8 @@ class MergeRequestDiff < ActiveRecord::Base ...@@ -169,8 +169,8 @@ class MergeRequestDiff < ActiveRecord::Base
# When compare merge request versions we want diff A..B instead of A...B # 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. # 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. # For this reason we set straight to true by default.
CompareService.new(project, head_commit_sha). CompareService.new(project, head_commit_sha)
execute(project, sha, straight: straight) .execute(project, sha, straight: straight)
end end
def commits_count def commits_count
......
...@@ -70,8 +70,8 @@ module Commits ...@@ -70,8 +70,8 @@ module Commits
# Temporary branch exists and contains the change commit # Temporary branch exists and contains the change commit
return if repository.find_branch(new_branch) return if repository.find_branch(new_branch)
result = ValidateNewBranchService.new(@project, current_user). result = ValidateNewBranchService.new(@project, current_user)
execute(new_branch) .execute(new_branch)
if result[:status] == :error if result[:status] == :error
raise ChangeError, "There was an error creating the source branch: #{result[:message]}" raise ChangeError, "There was an error creating the source branch: #{result[:message]}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment