diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-27 03:05:08 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-27 03:05:08 +0000 |
| commit | ad3843aee14abb36e0f4a7ede7210f26ed4879c9 (patch) | |
| tree | 8fbd4a13459143269330968333298a3d6a614878 | |
| parent | 83ec509ce43c56da601335de5b9ea4422c785560 (diff) | |
| parent | c40dc54f26c3b959ce505e4b239baf0dd17ec06c (diff) | |
| download | gitlab-ce-ad3843aee14abb36e0f4a7ede7210f26ed4879c9.tar.gz | |
Merge branch '34309-drop-gfm-mr-ms' into 'master'
Drop GFM support for the title of Milestone/MergeReuqest in template
Closes #34309
See merge request !12451
| -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 |