summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-06-27 03:05:08 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-06-27 03:05:08 +0000
commitad3843aee14abb36e0f4a7ede7210f26ed4879c9 (patch)
tree8fbd4a13459143269330968333298a3d6a614878 /app/views/projects
parent83ec509ce43c56da601335de5b9ea4422c785560 (diff)
parentc40dc54f26c3b959ce505e4b239baf0dd17ec06c (diff)
downloadgitlab-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
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/issues/_merge_requests.html.haml2
1 files changed, 1 insertions, 1 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