Commit 94238a9a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents bfc8ded1 df91781a
...@@ -76,6 +76,7 @@ v 7.9.0 (unreleased) ...@@ -76,6 +76,7 @@ v 7.9.0 (unreleased)
- Prevent gitlab-shell character encoding issues by receiving its changes as raw data. - Prevent gitlab-shell character encoding issues by receiving its changes as raw data.
- Ability to unsubscribe/subscribe to issue or merge request - Ability to unsubscribe/subscribe to issue or merge request
- Delete deploy key when last connection to a project is destroyed. - Delete deploy key when last connection to a project is destroyed.
- Fix invalid Atom feeds when using emoji, horizontal rules, or images (Christian Walther)
v 7.8.4 v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers - Fix issue_tracker_id substitution in custom issue trackers
......
%div{xmlns: "http://www.w3.org/1999/xhtml"} %div{xmlns: "http://www.w3.org/1999/xhtml"}
- if issue.description.present? - if issue.description.present?
= markdown issue.description = markdown(issue.description, xhtml: true)
%div{xmlns: "http://www.w3.org/1999/xhtml"} %div{xmlns: "http://www.w3.org/1999/xhtml"}
- if merge_request.description.present? - if merge_request.description.present?
= markdown merge_request.description = markdown(merge_request.description, xhtml: true)
%div{xmlns: "http://www.w3.org/1999/xhtml"} %div{xmlns: "http://www.w3.org/1999/xhtml"}
= markdown note.note = markdown(note.note, xhtml: true)
...@@ -6,7 +6,7 @@ ...@@ -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])) %blockquote= markdown(escape_once(commit[:message]), xhtml: true)
- if event.commits_count > 15 - if event.commits_count > 15
%p %p
%i %i
......
...@@ -34,17 +34,23 @@ module Gitlab ...@@ -34,17 +34,23 @@ module Gitlab
attr_reader :html_options attr_reader :html_options
def gfm_with_tasks(text, project = @project, html_options = {}) # Public: Parse the provided text with GitLab-Flavored Markdown
text = gfm(text, project, html_options) #
parse_tasks(text) # text - the source text
# project - extra options for the reference links as given to link_to
# html_options - extra options for the reference links as given to link_to
def gfm(text, project = @project, html_options = {})
gfm_with_options(text, {}, project, html_options)
end end
# Public: Parse the provided text with GitLab-Flavored Markdown # Public: Parse the provided text with GitLab-Flavored Markdown
# #
# text - the source text # text - the source text
# options - parse_tasks: true - render tasks
# - xhtml: true - output XHTML instead of HTML
# project - extra options for the reference links as given to link_to # project - extra options for the reference links as given to link_to
# html_options - extra options for the reference links as given to link_to # html_options - extra options for the reference links as given to link_to
def gfm(text, project = @project, html_options = {}) def gfm_with_options(text, options = {}, project = @project, html_options = {})
return text if text.nil? return text if text.nil?
# Duplicate the string so we don't alter the original, then call to_str # Duplicate the string so we don't alter the original, then call to_str
...@@ -87,14 +93,22 @@ module Gitlab ...@@ -87,14 +93,22 @@ module Gitlab
markdown_pipeline = HTML::Pipeline::Gitlab.new(filters).pipeline markdown_pipeline = HTML::Pipeline::Gitlab.new(filters).pipeline
result = markdown_pipeline.call(text, markdown_context) result = markdown_pipeline.call(text, markdown_context)
text = result[:output].to_html(save_with: 0) saveoptions = 0
if options[:xhtml]
saveoptions |= Nokogiri::XML::Node::SaveOptions::AS_XHTML
end
text = result[:output].to_html(save_with: saveoptions)
allowed_attributes = ActionView::Base.sanitized_allowed_attributes allowed_attributes = ActionView::Base.sanitized_allowed_attributes
allowed_tags = ActionView::Base.sanitized_allowed_tags allowed_tags = ActionView::Base.sanitized_allowed_tags
sanitize text.html_safe, text = sanitize text.html_safe,
attributes: allowed_attributes + %w(id class style), attributes: allowed_attributes + %w(id class style),
tags: allowed_tags + %w(table tr td th) tags: allowed_tags + %w(table tr td th)
if options[:parse_tasks]
text = parse_tasks(text)
end
text
end end
private private
......
...@@ -67,10 +67,6 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML ...@@ -67,10 +67,6 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
unless @template.instance_variable_get("@project_wiki") || @project.nil? unless @template.instance_variable_get("@project_wiki") || @project.nil?
full_document = h.create_relative_links(full_document) full_document = h.create_relative_links(full_document)
end end
if @options[:parse_tasks] h.gfm_with_options(full_document, @options)
h.gfm_with_tasks(full_document)
else
h.gfm(full_document)
end
end end
end end
...@@ -15,17 +15,24 @@ describe "User Feed", feature: true do ...@@ -15,17 +15,24 @@ describe "User Feed", feature: true do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:issue) do let(:issue) do
create(:issue, project: project, create(:issue, project: project,
author: user, description: '') author: user, description: "Houston, we have a bug!\n\n***\n\nI guess.")
end end
let(:note) do let(:note) do
create(:note, noteable: issue, author: user, create(:note, noteable: issue, author: user,
note: 'Bug confirmed', project: project) note: 'Bug confirmed :+1:', project: project)
end
let(:merge_request) do
create(:merge_request,
title: 'Fix bug', author: user,
source_project: project, target_project: project,
description: "Here is the fix: ![an image](image.png)")
end end
before do before do
project.team << [user, :master] project.team << [user, :master]
issue_event(issue, user) issue_event(issue, user)
note_event(note, user) note_event(note, user)
merge_request_event(merge_request, user)
visit user_path(user, :atom, private_token: user.private_token) visit user_path(user, :atom, private_token: user.private_token)
end end
...@@ -37,6 +44,18 @@ describe "User Feed", feature: true do ...@@ -37,6 +44,18 @@ describe "User Feed", feature: true do
expect(body). expect(body).
to have_content("#{safe_name} commented on issue ##{issue.iid}") to have_content("#{safe_name} commented on issue ##{issue.iid}")
end end
it 'should have XHTML summaries in issue descriptions' do
expect(body).to match /we have a bug!<\/p>\n\n<hr ?\/>\n\n<p>I guess/
end
it 'should have XHTML summaries in notes' do
expect(body).to match /Bug confirmed <img[^>]*\/>/
end
it 'should have XHTML summaries in merge request descriptions' do
expect(body).to match /Here is the fix: <img[^>]*\/>/
end
end end
end end
...@@ -48,6 +67,10 @@ describe "User Feed", feature: true do ...@@ -48,6 +67,10 @@ describe "User Feed", feature: true do
EventCreateService.new.leave_note(note, user) EventCreateService.new.leave_note(note, user)
end end
def merge_request_event(request, user)
EventCreateService.new.open_mr(request, user)
end
def safe_name def safe_name
html_escape(user.name) html_escape(user.name)
end end
......
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