Added author to various Markdown calls in views
This ensures all these calls have an author set, allowing the use of "all" mentions where possible.
This commit is contained in:
parent
86166d2802
commit
25c08d11bb
21 changed files with 24 additions and 24 deletions
|
@ -16,7 +16,7 @@
|
||||||
.light.small
|
.light.small
|
||||||
= time_ago_with_tooltip(abuse_report.created_at)
|
= time_ago_with_tooltip(abuse_report.created_at)
|
||||||
%td
|
%td
|
||||||
= markdown(abuse_report.message.squish!, pipeline: :single_line)
|
= markdown(abuse_report.message.squish!, pipeline: :single_line, author: reporter)
|
||||||
%td
|
%td
|
||||||
- if user
|
- if user
|
||||||
= link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true),
|
= link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true),
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
.commit-row-title
|
.commit-row-title
|
||||||
= link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: '', title: truncate_sha(commit[:id])
|
= link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: '', title: truncate_sha(commit[:id])
|
||||||
·
|
·
|
||||||
= markdown event_commit_title(commit[:message]), project: project, pipeline: :single_line
|
= markdown event_commit_title(commit[:message]), project: project, pipeline: :single_line, author: event.author
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
||||||
= markdown(issue.description, pipeline: :atom, project: issue.project)
|
= markdown(issue.description, pipeline: :atom, project: issue.project, author: issue.author)
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
||||||
= markdown(merge_request.description, pipeline: :atom, project: merge_request.project)
|
= markdown(merge_request.description, pipeline: :atom, project: merge_request.project, author: merge_request.author)
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
||||||
= markdown(note.note, pipeline: :atom, project: note.project)
|
= markdown(note.note, pipeline: :atom, project: note.project, author: note.author)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
%i
|
%i
|
||||||
at
|
at
|
||||||
= commit[:timestamp].to_time.to_s(:short)
|
= commit[:timestamp].to_time.to_s(:short)
|
||||||
%blockquote= markdown(escape_once(commit[:message]), pipeline: :atom, project: event.project)
|
%blockquote= markdown(escape_once(commit[:message]), pipeline: :atom, project: event.project, author: event.author)
|
||||||
- if event.commits_count > 15
|
- if event.commits_count > 15
|
||||||
%p
|
%p
|
||||||
%i
|
%i
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
%ul.well-list.event_commits
|
%ul.well-list.event_commits
|
||||||
- few_commits = event.commits[0...2]
|
- few_commits = event.commits[0...2]
|
||||||
- few_commits.each do |commit|
|
- few_commits.each do |commit|
|
||||||
= render "events/commit", commit: commit, project: project
|
= render "events/commit", commit: commit, project: project, event: event
|
||||||
|
|
||||||
- create_mr = event.new_ref? && create_mr_button?(event.project.default_branch, event.ref_name, event.project)
|
- create_mr = event.new_ref? && create_mr_button?(event.project.default_branch, event.ref_name, event.project)
|
||||||
- if event.commits_count > 1
|
- if event.commits_count > 1
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
%div
|
%div
|
||||||
#{link_to @note.author_name, user_url(@note.author)} wrote:
|
#{link_to @note.author_name, user_url(@note.author)} wrote:
|
||||||
%div
|
%div
|
||||||
= markdown(@note.note, pipeline: :email)
|
= markdown(@note.note, pipeline: :email, author: @note.author)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
%div
|
%div
|
||||||
#{link_to @issue.author_name, user_url(@issue.author)} wrote:
|
#{link_to @issue.author_name, user_url(@issue.author)} wrote:
|
||||||
-if @issue.description
|
-if @issue.description
|
||||||
= markdown(@issue.description, pipeline: :email)
|
= markdown(@issue.description, pipeline: :email, author: @issue.author)
|
||||||
|
|
||||||
- if @issue.assignee_id.present?
|
- if @issue.assignee_id.present?
|
||||||
%p
|
%p
|
||||||
|
|
|
@ -9,4 +9,4 @@
|
||||||
Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
|
Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
|
||||||
|
|
||||||
-if @merge_request.description
|
-if @merge_request.description
|
||||||
= markdown(@merge_request.description, pipeline: :email)
|
= markdown(@merge_request.description, pipeline: :email, author: @merge_request.author)
|
||||||
|
|
|
@ -59,10 +59,10 @@
|
||||||
|
|
||||||
.commit-box.content-block
|
.commit-box.content-block
|
||||||
%h3.commit-title
|
%h3.commit-title
|
||||||
= markdown escape_once(@commit.title), pipeline: :single_line
|
= markdown escape_once(@commit.title), pipeline: :single_line, author: @commit.author
|
||||||
- if @commit.description.present?
|
- if @commit.description.present?
|
||||||
%pre.commit-description
|
%pre.commit-description
|
||||||
= preserve(markdown(escape_once(@commit.description), pipeline: :single_line))
|
= preserve(markdown(escape_once(@commit.description), pipeline: :single_line, author: @commit.author))
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(".commit-info.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
|
$(".commit-info.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
- if commit.description?
|
- if commit.description?
|
||||||
.commit-row-description.js-toggle-content
|
.commit-row-description.js-toggle-content
|
||||||
%pre
|
%pre
|
||||||
= preserve(markdown(escape_once(commit.description), pipeline: :single_line))
|
= preserve(markdown(escape_once(commit.description), pipeline: :single_line, author: commit.author))
|
||||||
|
|
||||||
.commit-row-info
|
.commit-row-info
|
||||||
by
|
by
|
||||||
|
|
|
@ -53,12 +53,12 @@
|
||||||
.issue-details.issuable-details
|
.issue-details.issuable-details
|
||||||
.detail-page-description.content-block
|
.detail-page-description.content-block
|
||||||
%h2.title
|
%h2.title
|
||||||
= markdown escape_once(@issue.title), pipeline: :single_line
|
= markdown escape_once(@issue.title), pipeline: :single_line, author: @issue.author
|
||||||
- if @issue.description.present?
|
- if @issue.description.present?
|
||||||
.description{ class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '' }
|
.description{ class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : '' }
|
||||||
.wiki
|
.wiki
|
||||||
= preserve do
|
= preserve do
|
||||||
= markdown(@issue.description, cache_key: [@issue, "description"])
|
= markdown(@issue.description, cache_key: [@issue, "description"], author: @issue.author)
|
||||||
%textarea.hidden.js-task-list-field
|
%textarea.hidden.js-task-list-field
|
||||||
= @issue.description
|
= @issue.description
|
||||||
= edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago')
|
= edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago')
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
.detail-page-description.content-block
|
.detail-page-description.content-block
|
||||||
%h2.title
|
%h2.title
|
||||||
= markdown escape_once(@merge_request.title), pipeline: :single_line
|
= markdown escape_once(@merge_request.title), pipeline: :single_line, author: @merge_request.author
|
||||||
|
|
||||||
%div
|
%div
|
||||||
- if @merge_request.description.present?
|
- if @merge_request.description.present?
|
||||||
.description{class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : ''}
|
.description{class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : ''}
|
||||||
.wiki
|
.wiki
|
||||||
= preserve do
|
= preserve do
|
||||||
= markdown(@merge_request.description, cache_key: [@merge_request, "description"])
|
= markdown(@merge_request.description, cache_key: [@merge_request, "description"], author: @merge_request.author)
|
||||||
%textarea.hidden.js-task-list-field
|
%textarea.hidden.js-task-list-field
|
||||||
= @merge_request.description
|
= @merge_request.description
|
||||||
|
|
||||||
|
|
|
@ -26,4 +26,4 @@
|
||||||
%i.fa.fa-check
|
%i.fa.fa-check
|
||||||
Accepting this merge request will close #{"issue".pluralize(@closes_issues.size)}
|
Accepting this merge request will close #{"issue".pluralize(@closes_issues.size)}
|
||||||
= succeed '.' do
|
= succeed '.' do
|
||||||
!= markdown issues_sentence(@closes_issues), pipeline: :gfm
|
!= markdown issues_sentence(@closes_issues), pipeline: :gfm, author: @merge_request.author
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
.note-body{class: note_editable ? 'js-task-list-container' : ''}
|
.note-body{class: note_editable ? 'js-task-list-container' : ''}
|
||||||
.note-text
|
.note-text
|
||||||
= preserve do
|
= preserve do
|
||||||
= markdown(note.note, pipeline: :note, cache_key: [note, "note"])
|
= markdown(note.note, pipeline: :note, cache_key: [note, "note"], author: note.author)
|
||||||
- if note_editable
|
- if note_editable
|
||||||
= render 'projects/notes/edit_form', note: note
|
= render 'projects/notes/edit_form', note: note
|
||||||
= edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
|
= edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
= link_to namespace_project_commits_path(@project.namespace, @project, commit.id) do
|
= link_to namespace_project_commits_path(@project.namespace, @project, commit.id) do
|
||||||
%code= commit.short_id
|
%code= commit.short_id
|
||||||
= image_tag avatar_icon(commit.author_email), class: "", width: 16, alt: ''
|
= image_tag avatar_icon(commit.author_email), class: "", width: 16, alt: ''
|
||||||
= markdown escape_once(truncate(commit.title, length: 40)), pipeline: :single_line
|
= markdown escape_once(truncate(commit.title, length: 40)), pipeline: :single_line, author: commit.author
|
||||||
%td
|
%td
|
||||||
%span.pull-right.cgray
|
%span.pull-right.cgray
|
||||||
= time_ago_with_tooltip(commit.committed_date)
|
= time_ago_with_tooltip(commit.committed_date)
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
- if issue.description.present?
|
- if issue.description.present?
|
||||||
.description.term
|
.description.term
|
||||||
= preserve do
|
= preserve do
|
||||||
= search_md_sanitize(markdown(truncate(issue.description, length: 200, separator: " "), { project: issue.project }))
|
= search_md_sanitize(markdown(truncate(issue.description, length: 200, separator: " "), { project: issue.project, author: issue.author }))
|
||||||
%span.light
|
%span.light
|
||||||
#{issue.project.name_with_namespace}
|
#{issue.project.name_with_namespace}
|
||||||
- if issue.closed?
|
- if issue.closed?
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
- if merge_request.description.present?
|
- if merge_request.description.present?
|
||||||
.description.term
|
.description.term
|
||||||
= preserve do
|
= preserve do
|
||||||
= search_md_sanitize(markdown(merge_request.description, { project: merge_request.project }))
|
= search_md_sanitize(markdown(merge_request.description, { project: merge_request.project, author: merge_request.author }))
|
||||||
%span.light
|
%span.light
|
||||||
#{merge_request.project.name_with_namespace}
|
#{merge_request.project.name_with_namespace}
|
||||||
.pull-right
|
.pull-right
|
||||||
|
|
|
@ -19,4 +19,4 @@
|
||||||
.note-search-result
|
.note-search-result
|
||||||
.term
|
.term
|
||||||
= preserve do
|
= preserve do
|
||||||
= search_md_sanitize(markdown(note.note, {no_header_anchors: true}))
|
= search_md_sanitize(markdown(note.note, {no_header_anchors: true, author: note.author}))
|
||||||
|
|
|
@ -21,4 +21,4 @@
|
||||||
|
|
||||||
.content-block.second-block
|
.content-block.second-block
|
||||||
%h2.snippet-title.prepend-top-0.append-bottom-0
|
%h2.snippet-title.prepend-top-0.append-bottom-0
|
||||||
= markdown escape_once(@snippet.title), pipeline: :single_line
|
= markdown escape_once(@snippet.title), pipeline: :single_line, author: @snippet.author
|
||||||
|
|
Loading…
Reference in a new issue