2015-04-30 23:16:19 -04:00
|
|
|
# SystemNoteService
|
|
|
|
#
|
|
|
|
# Used for creating system notes (e.g., when a user references a merge request
|
|
|
|
# from an issue, an issue's assignee changes, an issue is closed, etc.)
|
2016-07-19 08:18:51 -04:00
|
|
|
module SystemNoteService
|
|
|
|
extend self
|
|
|
|
|
2015-05-09 18:18:50 -04:00
|
|
|
# Called when commits are added to a Merge Request
|
|
|
|
#
|
|
|
|
# noteable - Noteable object
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
|
|
|
# new_commits - Array of Commits added since last push
|
|
|
|
# existing_commits - Array of Commits added in a previous push
|
2015-05-26 16:30:07 -04:00
|
|
|
# oldrev - Optional String SHA of a previous Commit
|
2015-05-09 18:18:50 -04:00
|
|
|
#
|
|
|
|
# See new_commit_summary and existing_commit_summary.
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def add_commits(noteable, project, author, new_commits, existing_commits = [], oldrev = nil)
|
2015-05-09 18:18:50 -04:00
|
|
|
total_count = new_commits.length + existing_commits.length
|
|
|
|
commits_text = "#{total_count} commit".pluralize(total_count)
|
|
|
|
|
|
|
|
body = "Added #{commits_text}:\n\n"
|
|
|
|
body << existing_commit_summary(noteable, existing_commits, oldrev)
|
|
|
|
body << new_commit_summary(new_commits).join("\n")
|
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2015-04-30 23:16:19 -04:00
|
|
|
# Called when the assignee of a Noteable is changed or removed
|
|
|
|
#
|
|
|
|
# noteable - Noteable object
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
|
|
|
# assignee - User being assigned, or nil
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
|
|
|
# "Assignee removed"
|
|
|
|
#
|
|
|
|
# "Reassigned to @rspeicher"
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def change_assignee(noteable, project, author, assignee)
|
2015-12-24 08:43:26 -05:00
|
|
|
body = assignee.nil? ? 'Assignee removed' : "Reassigned to #{assignee.to_reference}"
|
2015-04-30 23:16:19 -04:00
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
|
|
|
# Called when one or more labels on a Noteable are added and/or removed
|
|
|
|
#
|
|
|
|
# noteable - Noteable object
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
|
|
|
# added_labels - Array of Labels added
|
|
|
|
# removed_labels - Array of Labels removed
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
|
|
|
# "Added ~1 and removed ~2 ~3 labels"
|
|
|
|
#
|
|
|
|
# "Added ~4 label"
|
|
|
|
#
|
|
|
|
# "Removed ~5 label"
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def change_label(noteable, project, author, added_labels, removed_labels)
|
2015-04-30 23:16:19 -04:00
|
|
|
labels_count = added_labels.count + removed_labels.count
|
|
|
|
|
2016-02-25 02:37:49 -05:00
|
|
|
references = ->(label) { label.to_reference(format: :id) }
|
2015-04-30 23:16:19 -04:00
|
|
|
added_labels = added_labels.map(&references).join(' ')
|
|
|
|
removed_labels = removed_labels.map(&references).join(' ')
|
|
|
|
|
|
|
|
body = ''
|
|
|
|
|
|
|
|
if added_labels.present?
|
|
|
|
body << "added #{added_labels}"
|
|
|
|
body << ' and ' if removed_labels.present?
|
|
|
|
end
|
|
|
|
|
|
|
|
if removed_labels.present?
|
|
|
|
body << "removed #{removed_labels}"
|
|
|
|
end
|
|
|
|
|
|
|
|
body << ' ' << 'label'.pluralize(labels_count)
|
2016-07-06 09:26:59 -04:00
|
|
|
body = body.capitalize
|
2015-04-30 23:16:19 -04:00
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
|
|
|
# Called when the milestone of a Noteable is changed
|
|
|
|
#
|
|
|
|
# noteable - Noteable object
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
|
|
|
# milestone - Milestone being assigned, or nil
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
|
|
|
# "Milestone removed"
|
|
|
|
#
|
|
|
|
# "Miletone changed to 7.11"
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def change_milestone(noteable, project, author, milestone)
|
2015-04-30 23:16:19 -04:00
|
|
|
body = 'Milestone '
|
2015-12-24 08:43:26 -05:00
|
|
|
body += milestone.nil? ? 'removed' : "changed to #{milestone.to_reference(project)}"
|
2015-04-30 23:16:19 -04:00
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
|
|
|
# Called when the status of a Noteable is changed
|
|
|
|
#
|
|
|
|
# noteable - Noteable object
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
|
|
|
# status - String status
|
|
|
|
# source - Mentionable performing the change, or nil
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
|
|
|
# "Status changed to merged"
|
|
|
|
#
|
|
|
|
# "Status changed to closed by bc17db76"
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def change_status(noteable, project, author, status, source)
|
2015-04-30 23:16:19 -04:00
|
|
|
body = "Status changed to #{status}"
|
2016-07-06 09:26:59 -04:00
|
|
|
body << " by #{source.gfm_reference(project)}" if source
|
2015-04-30 23:16:19 -04:00
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2015-11-02 11:27:38 -05:00
|
|
|
# Called when 'merge when build succeeds' is executed
|
2016-07-19 08:18:51 -04:00
|
|
|
def merge_when_build_succeeds(noteable, project, author, last_commit)
|
2015-12-07 05:54:07 -05:00
|
|
|
body = "Enabled an automatic merge when the build for #{last_commit.to_reference(project)} succeeds"
|
2015-11-02 11:27:38 -05:00
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
|
|
|
# Called when 'merge when build succeeds' is canceled
|
2016-07-19 08:18:51 -04:00
|
|
|
def cancel_merge_when_build_succeeds(noteable, project, author)
|
2016-07-06 09:26:59 -04:00
|
|
|
body = 'Canceled the automatic merge'
|
2015-11-02 11:27:38 -05:00
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def remove_merge_request_wip(noteable, project, author)
|
2016-03-18 18:27:35 -04:00
|
|
|
body = 'Unmarked this merge request as a Work In Progress'
|
2016-02-26 22:34:14 -05:00
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def add_merge_request_wip(noteable, project, author)
|
2016-03-18 18:27:35 -04:00
|
|
|
body = 'Marked this merge request as a **Work In Progress**'
|
2016-02-26 22:34:14 -05:00
|
|
|
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2016-07-28 22:39:35 -04:00
|
|
|
def self.resolve_all_discussions(merge_request, project, author)
|
|
|
|
body = "Resolved all discussions"
|
|
|
|
|
|
|
|
create_note(noteable: merge_request, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2015-05-26 21:49:04 -04:00
|
|
|
# Called when the title of a Noteable is changed
|
|
|
|
#
|
|
|
|
# noteable - Noteable object that responds to `title`
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
|
|
|
# old_title - Previous String title
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
|
|
|
# "Title changed from **Old** to **New**"
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def change_title(noteable, project, author, old_title)
|
2016-04-06 15:37:09 -04:00
|
|
|
new_title = noteable.title.dup
|
|
|
|
|
|
|
|
old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_title, new_title).inline_diffs
|
|
|
|
|
|
|
|
marked_old_title = Gitlab::Diff::InlineDiffMarker.new(old_title).mark(old_diffs, mode: :deletion, markdown: true)
|
|
|
|
marked_new_title = Gitlab::Diff::InlineDiffMarker.new(new_title).mark(new_diffs, mode: :addition, markdown: true)
|
|
|
|
|
|
|
|
body = "Changed title: **#{marked_old_title}** → **#{marked_new_title}**"
|
2015-05-26 21:49:04 -04:00
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2016-04-20 18:41:11 -04:00
|
|
|
# Called when the confidentiality changes
|
|
|
|
#
|
2016-05-18 13:56:13 -04:00
|
|
|
# issue - Issue object
|
|
|
|
# project - Project owning the issue
|
|
|
|
# author - User performing the change
|
2016-04-20 18:41:11 -04:00
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
2016-05-18 13:56:13 -04:00
|
|
|
# "Made the issue confidential"
|
2016-04-20 18:41:11 -04:00
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def change_issue_confidentiality(issue, project, author)
|
2016-05-18 13:56:13 -04:00
|
|
|
body = issue.confidential ? 'Made the issue confidential' : 'Made the issue visible'
|
|
|
|
create_note(noteable: issue, project: project, author: author, note: body)
|
2016-04-20 18:41:11 -04:00
|
|
|
end
|
|
|
|
|
2015-05-28 21:00:37 -04:00
|
|
|
# Called when a branch in Noteable is changed
|
|
|
|
#
|
|
|
|
# noteable - Noteable object
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
|
|
|
# branch_type - 'source' or 'target'
|
|
|
|
# old_branch - old branch name
|
|
|
|
# new_branch - new branch nmae
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
|
|
|
# "Target branch changed from `Old` to `New`"
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def change_branch(noteable, project, author, branch_type, old_branch, new_branch)
|
2015-05-28 21:00:37 -04:00
|
|
|
body = "#{branch_type} branch changed from `#{old_branch}` to `#{new_branch}`".capitalize
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2015-10-15 04:41:46 -04:00
|
|
|
# Called when a branch in Noteable is added or deleted
|
|
|
|
#
|
|
|
|
# noteable - Noteable object
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
2015-10-15 05:08:22 -04:00
|
|
|
# branch_type - :source or :target
|
2015-10-15 04:41:46 -04:00
|
|
|
# branch - branch name
|
2015-10-15 05:08:22 -04:00
|
|
|
# presence - :add or :delete
|
2015-10-15 04:41:46 -04:00
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
2015-10-16 03:51:25 -04:00
|
|
|
# "Restored target branch `feature`"
|
2015-10-15 04:41:46 -04:00
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def change_branch_presence(noteable, project, author, branch_type, branch, presence)
|
2015-10-15 05:08:22 -04:00
|
|
|
verb =
|
|
|
|
if presence == :add
|
|
|
|
'restored'
|
|
|
|
else
|
|
|
|
'deleted'
|
|
|
|
end
|
2016-07-06 09:26:59 -04:00
|
|
|
|
2015-10-16 03:51:25 -04:00
|
|
|
body = "#{verb} #{branch_type.to_s} branch `#{branch}`".capitalize
|
2015-10-15 04:41:46 -04:00
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2016-02-17 01:11:48 -05:00
|
|
|
# Called when a branch is created from the 'new branch' button on a issue
|
|
|
|
# Example note text:
|
|
|
|
#
|
2016-04-13 15:20:03 -04:00
|
|
|
# "Started branch `201-issue-branch-button`"
|
2016-07-19 08:18:51 -04:00
|
|
|
def new_issue_branch(issue, project, author, branch)
|
2016-03-24 12:00:26 -04:00
|
|
|
h = Gitlab::Routing.url_helpers
|
2016-03-15 15:17:51 -04:00
|
|
|
link = h.namespace_project_compare_url(project.namespace, project, from: project.default_branch, to: branch)
|
2016-02-19 05:58:02 -05:00
|
|
|
|
2016-03-15 15:17:51 -04:00
|
|
|
body = "Started branch [`#{branch}`](#{link})"
|
2016-02-17 01:11:48 -05:00
|
|
|
create_note(noteable: issue, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2015-05-09 18:18:50 -04:00
|
|
|
# Called when a Mentionable references a Noteable
|
|
|
|
#
|
|
|
|
# noteable - Noteable object being referenced
|
|
|
|
# mentioner - Mentionable object
|
|
|
|
# author - User performing the reference
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
2016-08-25 11:47:40 -04:00
|
|
|
# "Mentioned in #1"
|
2015-05-09 18:18:50 -04:00
|
|
|
#
|
2016-08-25 11:47:40 -04:00
|
|
|
# "Mentioned in !2"
|
2015-05-09 18:18:50 -04:00
|
|
|
#
|
2016-08-25 11:47:40 -04:00
|
|
|
# "Mentioned in 54f7727c"
|
2015-05-09 18:18:50 -04:00
|
|
|
#
|
|
|
|
# See cross_reference_note_content.
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
2016-07-19 08:18:51 -04:00
|
|
|
def cross_reference(noteable, mentioner, author)
|
2015-05-09 18:18:50 -04:00
|
|
|
return if cross_reference_disallowed?(noteable, mentioner)
|
|
|
|
|
2015-05-26 16:30:07 -04:00
|
|
|
gfm_reference = mentioner.gfm_reference(noteable.project)
|
2015-05-09 18:18:50 -04:00
|
|
|
|
|
|
|
note_options = {
|
|
|
|
project: noteable.project,
|
|
|
|
author: author,
|
|
|
|
note: cross_reference_note_content(gfm_reference)
|
|
|
|
}
|
|
|
|
|
|
|
|
if noteable.kind_of?(Commit)
|
|
|
|
note_options.merge!(noteable_type: 'Commit', commit_id: noteable.id)
|
|
|
|
else
|
|
|
|
note_options.merge!(noteable: noteable)
|
|
|
|
end
|
|
|
|
|
2015-12-17 17:08:14 -05:00
|
|
|
if noteable.is_a?(ExternalIssue)
|
|
|
|
noteable.project.issues_tracker.create_cross_reference_note(noteable, mentioner, author)
|
|
|
|
else
|
|
|
|
create_note(note_options)
|
|
|
|
end
|
2015-05-09 18:18:50 -04:00
|
|
|
end
|
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def cross_reference?(note_text)
|
2015-04-30 23:16:19 -04:00
|
|
|
note_text.start_with?(cross_reference_note_prefix)
|
|
|
|
end
|
|
|
|
|
2015-05-10 23:52:03 -04:00
|
|
|
# Check if a cross-reference is disallowed
|
|
|
|
#
|
2016-08-25 11:47:40 -04:00
|
|
|
# This method prevents adding a "Mentioned in !1" note on every single commit
|
2015-06-14 11:41:11 -04:00
|
|
|
# in a merge request. Additionally, it prevents the creation of references to
|
|
|
|
# external issues (which would fail).
|
2015-05-10 23:52:03 -04:00
|
|
|
#
|
|
|
|
# noteable - Noteable object being referenced
|
|
|
|
# mentioner - Mentionable object
|
|
|
|
#
|
|
|
|
# Returns Boolean
|
2016-07-19 08:18:51 -04:00
|
|
|
def cross_reference_disallowed?(noteable, mentioner)
|
2015-12-17 17:08:14 -05:00
|
|
|
return true if noteable.is_a?(ExternalIssue) && !noteable.project.jira_tracker_active?
|
2015-05-26 16:30:07 -04:00
|
|
|
return false unless mentioner.is_a?(MergeRequest)
|
|
|
|
return false unless noteable.is_a?(Commit)
|
2015-05-10 23:52:03 -04:00
|
|
|
|
|
|
|
mentioner.commits.include?(noteable)
|
2015-04-30 23:16:19 -04:00
|
|
|
end
|
|
|
|
|
2015-05-26 16:30:07 -04:00
|
|
|
# Check if a cross reference to a noteable from a mentioner already exists
|
|
|
|
#
|
|
|
|
# This method is used to prevent multiple notes being created for a mention
|
2016-02-16 03:01:56 -05:00
|
|
|
# when a issue is updated, for example. The method also calls notes_for_mentioner
|
|
|
|
# to check if the mentioner is a commit, and return matches only on commit hash
|
|
|
|
# instead of project + commit, to avoid repeated mentions from forks.
|
2015-05-26 16:30:07 -04:00
|
|
|
#
|
|
|
|
# noteable - Noteable object being referenced
|
|
|
|
# mentioner - Mentionable object
|
|
|
|
#
|
|
|
|
# Returns Boolean
|
2016-02-12 12:01:47 -05:00
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def cross_reference_exists?(noteable, mentioner)
|
2015-04-30 23:16:19 -04:00
|
|
|
# Initial scope should be system notes of this noteable type
|
|
|
|
notes = Note.system.where(noteable_type: noteable.class)
|
|
|
|
|
|
|
|
if noteable.is_a?(Commit)
|
|
|
|
# Commits have non-integer IDs, so they're stored in `commit_id`
|
|
|
|
notes = notes.where(commit_id: noteable.id)
|
|
|
|
else
|
|
|
|
notes = notes.where(noteable_id: noteable.id)
|
|
|
|
end
|
|
|
|
|
2016-02-12 12:01:47 -05:00
|
|
|
notes_for_mentioner(mentioner, noteable, notes).count > 0
|
2015-04-30 23:16:19 -04:00
|
|
|
end
|
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
# Build an Array of lines detailing each commit added in a merge request
|
|
|
|
#
|
|
|
|
# new_commits - Array of new Commit objects
|
|
|
|
#
|
|
|
|
# Returns an Array of Strings
|
|
|
|
def new_commit_summary(new_commits)
|
|
|
|
new_commits.collect do |commit|
|
|
|
|
"* #{commit.short_id} - #{escape_html(commit.title)}"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
# Called when the status of a Task has changed
|
|
|
|
#
|
|
|
|
# noteable - Noteable object.
|
|
|
|
# project - Project owning noteable
|
|
|
|
# author - User performing the change
|
|
|
|
# new_task - TaskList::Item object.
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
|
|
|
# "Soandso marked the task Whatever as completed."
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
|
|
|
def change_task_status(noteable, project, author, new_task)
|
|
|
|
status_label = new_task.complete? ? Taskable::COMPLETED : Taskable::INCOMPLETE
|
|
|
|
body = "Marked the task **#{new_task.source}** as #{status_label}"
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
|
|
|
# Called when noteable has been moved to another project
|
|
|
|
#
|
|
|
|
# direction - symbol, :to or :from
|
|
|
|
# noteable - Noteable object
|
|
|
|
# noteable_ref - Referenced noteable
|
|
|
|
# author - User performing the move
|
|
|
|
#
|
|
|
|
# Example Note text:
|
|
|
|
#
|
|
|
|
# "Moved to some_namespace/project_new#11"
|
|
|
|
#
|
|
|
|
# Returns the created Note object
|
|
|
|
def noteable_moved(noteable, project, noteable_ref, author, direction:)
|
|
|
|
unless [:to, :from].include?(direction)
|
|
|
|
raise ArgumentError, "Invalid direction `#{direction}`"
|
|
|
|
end
|
|
|
|
|
|
|
|
cross_reference = noteable_ref.to_reference(project)
|
|
|
|
body = "Moved #{direction} #{cross_reference}"
|
|
|
|
create_note(noteable: noteable, project: project, author: author, note: body)
|
|
|
|
end
|
|
|
|
|
2015-04-30 23:16:19 -04:00
|
|
|
private
|
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def notes_for_mentioner(mentioner, noteable, notes)
|
2016-02-12 12:01:47 -05:00
|
|
|
if mentioner.is_a?(Commit)
|
|
|
|
notes.where('note LIKE ?', "#{cross_reference_note_prefix}%#{mentioner.to_reference(nil)}")
|
|
|
|
else
|
|
|
|
gfm_reference = mentioner.gfm_reference(noteable.project)
|
|
|
|
notes.where(note: cross_reference_note_content(gfm_reference))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def create_note(args = {})
|
2015-04-30 23:16:19 -04:00
|
|
|
Note.create(args.merge(system: true))
|
|
|
|
end
|
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def cross_reference_note_prefix
|
2016-08-25 11:47:40 -04:00
|
|
|
'Mentioned in '
|
2015-04-30 23:16:19 -04:00
|
|
|
end
|
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def cross_reference_note_content(gfm_reference)
|
2015-05-09 18:09:34 -04:00
|
|
|
"#{cross_reference_note_prefix}#{gfm_reference}"
|
2015-04-30 23:16:19 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
# Build a single line summarizing existing commits being added in a merge
|
|
|
|
# request
|
|
|
|
#
|
|
|
|
# noteable - MergeRequest object
|
|
|
|
# existing_commits - Array of existing Commit objects
|
2015-05-26 16:30:07 -04:00
|
|
|
# oldrev - Optional String SHA of a previous Commit
|
2015-04-30 23:16:19 -04:00
|
|
|
#
|
|
|
|
# Examples:
|
|
|
|
#
|
|
|
|
# "* ea0f8418...2f4426b7 - 24 commits from branch `master`"
|
|
|
|
#
|
|
|
|
# "* ea0f8418..4188f0ea - 15 commits from branch `fork:master`"
|
|
|
|
#
|
|
|
|
# "* ea0f8418 - 1 commit from branch `feature`"
|
|
|
|
#
|
|
|
|
# Returns a newline-terminated String
|
2016-07-19 08:18:51 -04:00
|
|
|
def existing_commit_summary(noteable, existing_commits, oldrev = nil)
|
2015-04-30 23:16:19 -04:00
|
|
|
return '' if existing_commits.empty?
|
|
|
|
|
|
|
|
count = existing_commits.size
|
|
|
|
|
|
|
|
commit_ids = if count == 1
|
|
|
|
existing_commits.first.short_id
|
|
|
|
else
|
2015-10-21 11:34:12 -04:00
|
|
|
if oldrev && !Gitlab::Git.blank_ref?(oldrev)
|
2015-04-30 23:16:19 -04:00
|
|
|
"#{Commit.truncate_sha(oldrev)}...#{existing_commits.last.short_id}"
|
|
|
|
else
|
|
|
|
"#{existing_commits.first.short_id}..#{existing_commits.last.short_id}"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
commits_text = "#{count} commit".pluralize(count)
|
|
|
|
|
|
|
|
branch = noteable.target_branch
|
|
|
|
branch = "#{noteable.target_project_namespace}:#{branch}" if noteable.for_fork?
|
|
|
|
|
|
|
|
"* #{commit_ids} - #{commits_text} from branch `#{branch}`\n"
|
|
|
|
end
|
2015-10-22 11:18:59 -04:00
|
|
|
|
2016-07-19 08:18:51 -04:00
|
|
|
def escape_html(text)
|
2016-05-07 11:41:10 -04:00
|
|
|
Rack::Utils.escape_html(text)
|
|
|
|
end
|
2015-04-30 23:16:19 -04:00
|
|
|
end
|