diff options
| author | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2017-06-26 20:15:19 +0900 |
|---|---|---|
| committer | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2017-06-27 00:57:00 +0900 |
| commit | c40dc54f26c3b959ce505e4b239baf0dd17ec06c (patch) | |
| tree | 4f72223f3015708e21dc8e3de5fb8b38f497e1f7 | |
| parent | 831054a79d20e7af01106d9b1ac5a18965a51dc8 (diff) | |
| download | gitlab-ce-c40dc54f26c3b959ce505e4b239baf0dd17ec06c.tar.gz | |
Drop GFM support for the title of Milestone/MergeRequest in template
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/34309-drop-gfm-mr-ms.yml | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index d48923b422a..bda52fe461c 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -14,7 +14,7 @@ = merge_request.to_reference %span.merge-request-info %strong - = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title" + = link_to merge_request.title, merge_request_path(merge_request), class: "row_title" - unless @issue.project.id == merge_request.target_project.id in - project = merge_request.target_project diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 9e6a76e1ddb..680e1f3a4ea 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -4,7 +4,7 @@ %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id } .row .col-sm-6 - %strong= link_to_gfm truncate(milestone.title, length: 100), milestone_path + %strong= link_to truncate(milestone.title, length: 100), milestone_path .col-sm-6 .pull-right.light #{milestone.percent_complete(current_user)}% complete .row diff --git a/changelogs/unreleased/34309-drop-gfm-mr-ms.yml b/changelogs/unreleased/34309-drop-gfm-mr-ms.yml new file mode 100644 index 00000000000..07fe79e90ee --- /dev/null +++ b/changelogs/unreleased/34309-drop-gfm-mr-ms.yml @@ -0,0 +1,4 @@ +--- +title: Drop GFM support for the title of Milestone/MergeRequest in template +merge_request: 12451 +author: Takuya Noguchi |