0115ad66d2
* master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
166 lines
5.9 KiB
Ruby
166 lines
5.9 KiB
Ruby
class GitPushService < BaseService
|
|
attr_accessor :push_data, :push_commits
|
|
include Gitlab::CurrentSettings
|
|
include Gitlab::Access
|
|
|
|
# This method will be called after each git update
|
|
# and only if the provided user and project are present in GitLab.
|
|
#
|
|
# All callbacks for post receive action should be placed here.
|
|
#
|
|
# Next, this method:
|
|
# 1. Creates the push event
|
|
# 2. Updates merge requests
|
|
# 3. Recognizes cross-references from commit messages
|
|
# 4. Executes the project's webhooks
|
|
# 5. Executes the project's services
|
|
# 6. Checks if the project's main language has changed
|
|
#
|
|
def execute
|
|
@project.repository.after_push_commit(branch_name, params[:newrev])
|
|
|
|
if push_remove_branch?
|
|
@project.repository.after_remove_branch
|
|
@push_commits = []
|
|
elsif push_to_new_branch?
|
|
@project.repository.after_create_branch
|
|
|
|
# Re-find the pushed commits.
|
|
if is_default_branch?
|
|
# Initial push to the default branch. Take the full history of that branch as "newly pushed".
|
|
process_default_branch
|
|
else
|
|
# Use the pushed commits that aren't reachable by the default branch
|
|
# as a heuristic. This may include more commits than are actually pushed, but
|
|
# that shouldn't matter because we check for existing cross-references later.
|
|
@push_commits = @project.repository.commits_between(@project.default_branch, params[:newrev])
|
|
|
|
# don't process commits for the initial push to the default branch
|
|
process_commit_messages
|
|
end
|
|
elsif push_to_existing_branch?
|
|
# Collect data for this git push
|
|
@push_commits = @project.repository.commits_between(params[:oldrev], params[:newrev])
|
|
process_commit_messages
|
|
end
|
|
# Checks if the main language has changed in the project and if so
|
|
# it updates it accordingly
|
|
update_main_language
|
|
# Update merge requests that may be affected by this push. A new branch
|
|
# could cause the last commit of a merge request to change.
|
|
update_merge_requests
|
|
|
|
perform_housekeeping
|
|
end
|
|
|
|
def update_main_language
|
|
current_language = @project.repository.main_language
|
|
|
|
unless current_language == @project.main_language
|
|
return @project.update_attributes(main_language: current_language)
|
|
end
|
|
|
|
true
|
|
end
|
|
|
|
protected
|
|
|
|
def update_merge_requests
|
|
@project.update_merge_requests(params[:oldrev], params[:newrev], params[:ref], current_user)
|
|
|
|
EventCreateService.new.push(@project, current_user, build_push_data)
|
|
@project.execute_hooks(build_push_data.dup, :push_hooks)
|
|
@project.execute_services(build_push_data.dup, :push_hooks)
|
|
CreateCommitBuildsService.new.execute(@project, current_user, build_push_data)
|
|
ProjectCacheWorker.perform_async(@project.id)
|
|
end
|
|
|
|
def perform_housekeeping
|
|
housekeeping = Projects::HousekeepingService.new(@project)
|
|
housekeeping.increment!
|
|
housekeeping.execute if housekeeping.needed?
|
|
rescue Projects::HousekeepingService::LeaseTaken
|
|
end
|
|
|
|
def process_default_branch
|
|
@push_commits = project.repository.commits(params[:newrev])
|
|
|
|
# Ensure HEAD points to the default branch in case it is not master
|
|
project.change_head(branch_name)
|
|
|
|
# Set protection on the default branch if configured
|
|
if current_application_settings.default_branch_protection != PROTECTION_NONE
|
|
developers_can_push = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? true : false
|
|
@project.protected_branches.create({ name: @project.default_branch, developers_can_push: developers_can_push })
|
|
end
|
|
end
|
|
|
|
# Extract any GFM references from the pushed commit messages. If the configured issue-closing regex is matched,
|
|
# close the referenced Issue. Create cross-reference Notes corresponding to any other referenced Mentionables.
|
|
def process_commit_messages
|
|
is_default_branch = is_default_branch?
|
|
|
|
authors = Hash.new do |hash, commit|
|
|
email = commit.author_email
|
|
next hash[email] if hash.has_key?(email)
|
|
|
|
hash[email] = commit_user(commit)
|
|
end
|
|
|
|
@push_commits.each do |commit|
|
|
# Keep track of the issues that will be actually closed because they are on a default branch.
|
|
# Hence, when creating cross-reference notes, the not-closed issues (on non-default branches)
|
|
# will also have cross-reference.
|
|
closed_issues = []
|
|
|
|
if is_default_branch
|
|
# Close issues if these commits were pushed to the project's default branch and the commit message matches the
|
|
# closing regex. Exclude any mentioned Issues from cross-referencing even if the commits are being pushed to
|
|
# a different branch.
|
|
closed_issues = commit.closes_issues(current_user)
|
|
closed_issues.each do |issue|
|
|
if can?(current_user, :update_issue, issue)
|
|
Issues::CloseService.new(project, authors[commit], {}).execute(issue, commit: commit)
|
|
end
|
|
end
|
|
end
|
|
|
|
commit.create_cross_references!(authors[commit], closed_issues)
|
|
end
|
|
end
|
|
|
|
def build_push_data
|
|
@push_data ||= Gitlab::PushDataBuilder.
|
|
build(@project, current_user, params[:oldrev], params[:newrev], params[:ref], push_commits)
|
|
end
|
|
|
|
def push_to_existing_branch?
|
|
# Return if this is not a push to a branch (e.g. new commits)
|
|
Gitlab::Git.branch_ref?(params[:ref]) && !Gitlab::Git.blank_ref?(params[:oldrev])
|
|
end
|
|
|
|
def push_to_new_branch?
|
|
Gitlab::Git.branch_ref?(params[:ref]) && Gitlab::Git.blank_ref?(params[:oldrev])
|
|
end
|
|
|
|
def push_remove_branch?
|
|
Gitlab::Git.branch_ref?(params[:ref]) && Gitlab::Git.blank_ref?(params[:newrev])
|
|
end
|
|
|
|
def push_to_branch?
|
|
Gitlab::Git.branch_ref?(params[:ref])
|
|
end
|
|
|
|
def is_default_branch?
|
|
Gitlab::Git.branch_ref?(params[:ref]) &&
|
|
(Gitlab::Git.ref_name(params[:ref]) == project.default_branch || project.default_branch.nil?)
|
|
end
|
|
|
|
def commit_user(commit)
|
|
commit.author || current_user
|
|
end
|
|
|
|
def branch_name
|
|
@branch_name ||= Gitlab::Git.ref_name(params[:ref])
|
|
end
|
|
end
|