Commit 8ed7ac9d authored by Douwe Maan's avatar Douwe Maan
Browse files

Use project.commit convenience method.

parent 69e60751e1db
......@@ -36,6 +36,6 @@ def branches
end
def commit
@commit ||= @project.repository.commit(params[:id])
@commit ||= @project.commit(params[:id])
end
end
......@@ -146,7 +146,7 @@ def branch_from
def branch_to
@target_project = selected_target_project
@commit = @target_project.repository.commit(params[:ref]) if params[:ref].present?
@commit = @target_project.commit(params[:ref]) if params[:ref].present?
end
def update_branches
......
......@@ -290,7 +290,7 @@ def mentioner_gfm_ref(noteable, mentioner, project = nil)
# +mentioner+.
def noteable_project_id(noteable, mentioning_project)
if noteable.is_a?(Commit)
if mentioning_project.repository.commit(noteable.id)
if mentioning_project.commit(noteable.id)
# The noteable commit belongs to the mentioner's project
mentioning_project.id
else
......@@ -512,7 +512,7 @@ def for_project_snippet?
# override to return commits, which are not active record
def noteable
if for_commit?
project.repository.commit(commit_id)
project.commit(commit_id)
else
super
end
......
......@@ -257,7 +257,7 @@ def repository
@repository ||= Repository.new(path_with_namespace, nil, self)
end
def commit(id)
def commit(id = 'HEAD')
repository.commit(id)
end
......
......@@ -18,6 +18,6 @@ class ProtectedBranch < ActiveRecord::Base
validates :project, presence: true
def commit
project.repository.commit(self.name)
project.commit(self.name)
end
end
......@@ -38,7 +38,7 @@ def success(branch)
end
def create_push_data(project, user, tag)
commits = [project.repository.commit(tag.target)].compact
commits = [project.commit(tag.target)].compact
Gitlab::PushDataBuilder.
build(project, user, Gitlab::Git::BLANK_SHA, tag.target, "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}", commits, tag.message)
end
......
......@@ -25,7 +25,7 @@ def build_push_data(oldrev, newrev, ref)
tag_name = Gitlab::Git.ref_name(ref)
tag = project.repository.find_tag(tag_name)
if tag && tag.target == newrev
commit = project.repository.commit(tag.target)
commit = project.commit(tag.target)
commits = [commit].compact
message = tag.message
end
......
......@@ -22,7 +22,7 @@ def participants_in(type, id)
merge_request = project.merge_requests.find_by_iid(id)
merge_request.participants(current_user) if merge_request
when "Commit"
commit = project.repository.commit(id)
commit = project.commit(id)
commit.participants(project, current_user) if commit
end
......
......@@ -32,7 +32,7 @@ class Commits < Grape::API
# GET /projects/:id/repository/commits/:sha
get ":id/repository/commits/:sha" do
sha = params[:sha]
commit = user_project.repository.commit(sha)
commit = user_project.commit(sha)
not_found! "Commit" unless commit
present commit, with: Entities::RepoCommitDetail
end
......@@ -46,7 +46,7 @@ class Commits < Grape::API
# GET /projects/:id/repository/commits/:sha/diff
get ":id/repository/commits/:sha/diff" do
sha = params[:sha]
commit = user_project.repository.commit(sha)
commit = user_project.commit(sha)
not_found! "Commit" unless commit
commit.diffs
end
......@@ -60,7 +60,7 @@ class Commits < Grape::API
# GET /projects/:id/repository/commits/:sha/comments
get ':id/repository/commits/:sha/comments' do
sha = params[:sha]
commit = user_project.repository.commit(sha)
commit = user_project.commit(sha)
not_found! 'Commit' unless commit
notes = Note.where(commit_id: commit.id)
present paginate(notes), with: Entities::CommitNote
......@@ -81,7 +81,7 @@ class Commits < Grape::API
required_attributes! [:note]
sha = params[:sha]
commit = user_project.repository.commit(sha)
commit = user_project.commit(sha)
not_found! 'Commit' unless commit
opts = {
note: params[:note],
......
......@@ -34,7 +34,7 @@ class Files < Grape::API
ref = attrs.delete(:ref)
file_path = attrs.delete(:file_path)
commit = user_project.repository.commit(ref)
commit = user_project.commit(ref)
not_found! 'Commit' unless commit
blob = user_project.repository.blob_at(commit.sha, file_path)
......
......@@ -62,7 +62,7 @@ def handle_project_member_errors(errors)
ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
path = params[:path] || nil
commit = user_project.repository.commit(ref)
commit = user_project.commit(ref)
not_found!('Tree') unless commit
tree = user_project.repository.tree(commit.id, path)
......
......@@ -5,7 +5,7 @@ module Identifier
def identify(identifier, project, newrev)
if identifier.blank?
# Local push from gitlab
email = project.repository.commit(newrev).author_email rescue nil
email = project.commit(newrev).author_email rescue nil
User.find_by(email: email) if email
elsif identifier =~ /\Auser-\d+\Z/
......
......@@ -84,7 +84,7 @@ def split_commit_range(range)
def commit(id)
unless @commit_map[id]
@commit_map[id] = project.repository.commit(id)
@commit_map[id] = project.commit(id)
end
@commit_map[id]
......
......@@ -66,7 +66,7 @@ def commit_link_filter(text)
def commit_from_ref(project, commit_ref)
if project && project.valid_repo?
project.repository.commit(commit_ref)
project.commit(commit_ref)
end
end
......
......@@ -69,7 +69,7 @@ def build_base_data(project, user, note)
def build_data_for_commit(project, user, note)
# commit_id is the SHA hash
commit = project.repository.commit(note.commit_id)
commit = project.commit(note.commit_id)
commit.hook_attrs(project)
end
end
......
......@@ -3,7 +3,7 @@
describe Projects::CommitController do
let(:project) { create(:project) }
let(:user) { create(:user) }
let(:commit) { project.repository.commit("master") }
let(:commit) { project.commit("master") }
before do
sign_in(user)
......
......@@ -14,7 +14,7 @@
Commit.any_instance.stub(title: "fix ##{issue.iid}\n\nask @#{fred.username} for details")
end
let(:commit) { project.repository.commit }
let(:commit) { project.commit }
before do
login_as :user
......
......@@ -4,7 +4,7 @@
include RepoHelpers
let(:project) { create(:project) }
let(:commit) { project.repository.commit(sample_commit.id) }
let(:commit) { project.commit(sample_commit.id) }
let(:diff) { commit.diffs.first }
let(:diff_file) { Gitlab::Diff::File.new(diff) }
......
......@@ -6,7 +6,7 @@
let!(:project) { create(:project) }
let(:user) { create(:user, username: 'gfm') }
let(:commit) { project.repository.commit }
let(:commit) { project.commit }
let(:issue) { create(:issue, project: project) }
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
let(:snippet) { create(:project_snippet, project: project) }
......
......@@ -6,7 +6,7 @@
before {
@repository = project.repository
@commit = project.repository.commit("e56497bb")
@commit = project.commit("e56497bb")
}
context "on a directory containing more than one file/directory" do
......
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