diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/note.rb | 4 | ||||
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/protected_branch.rb | 2 | ||||
| -rw-r--r-- | app/services/create_tag_service.rb | 2 | ||||
| -rw-r--r-- | app/services/git_tag_push_service.rb | 2 | ||||
| -rw-r--r-- | app/services/projects/participants_service.rb | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 8a1b7899be3..35df421e09d 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -36,6 +36,6 @@ class Projects::CommitController < Projects::ApplicationController end def commit - @commit ||= @project.repository.commit(params[:id]) + @commit ||= @project.commit(params[:id]) end end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index ab75f2ddb73..41b4e55a598 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -146,7 +146,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController 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 diff --git a/app/models/note.rb b/app/models/note.rb index e3c571a1574..99e86ac0250 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -290,7 +290,7 @@ class Note < ActiveRecord::Base # +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 @@ class Note < ActiveRecord::Base # 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 diff --git a/app/models/project.rb b/app/models/project.rb index 4c1404ee9f8..293ee04f228 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -257,7 +257,7 @@ class Project < ActiveRecord::Base @repository ||= Repository.new(path_with_namespace, nil, self) end - def commit(id) + def commit(id = 'HEAD') repository.commit(id) end diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb index 97207ba1272..8ebd790a89e 100644 --- a/app/models/protected_branch.rb +++ b/app/models/protected_branch.rb @@ -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 diff --git a/app/services/create_tag_service.rb b/app/services/create_tag_service.rb index 25f9e203246..1a7318048b3 100644 --- a/app/services/create_tag_service.rb +++ b/app/services/create_tag_service.rb @@ -38,7 +38,7 @@ class CreateTagService < BaseService 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 diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb index bf203bbd692..075a6118da2 100644 --- a/app/services/git_tag_push_service.rb +++ b/app/services/git_tag_push_service.rb @@ -25,7 +25,7 @@ class GitTagPushService 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 diff --git a/app/services/projects/participants_service.rb b/app/services/projects/participants_service.rb index c2d8f48f6e4..05106fa7898 100644 --- a/app/services/projects/participants_service.rb +++ b/app/services/projects/participants_service.rb @@ -22,7 +22,7 @@ module Projects 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 |