summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-05-26 14:46:39 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-05-26 14:46:39 +0000
commit44cc765a8c42a38ebfc3caa16d4a19f56b850aff (patch)
tree81a7500c33b3f5a0fefdb3214d110ddf8ba56774 /app
parentf2caad2467f318ec1359ee9b03509e831cde9d16 (diff)
parent77a1565c806fece3a1d664c2c069f38dcb371c5c (diff)
downloadgitlab-ce-44cc765a8c42a38ebfc3caa16d4a19f56b850aff.tar.gz
Merge branch 'link-to-in-issues-index' into 'master'
Replace `link_to_gfm` with `link_to` in merge request and issue titles. ## What does this MR do? This removed GitLab Markdown Formatting from issue titles due to issues and confusion it caused as well as performance reasons. On the issue/MR page itself, the formatting is preserved. This only effects index pages. See: ![Screen_Shot_2016-05-24_at_3.31.17_PM](/uploads/8857ed7f3cc6a47ea41ca88134e5d17a/Screen_Shot_2016-05-24_at_3.31.17_PM.png) I think the trade-off here is worth it, otherwise we'd just be playing wack-a-mole. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused a number of users, so it’s removed. This is also ever so slightly more performant :) ## What are the relevant issue numbers? This fixes #17614 and #17230. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-05-24_at_3.19.52_PM](/uploads/25313af3d3995a096b7bad7c5a26d071/Screen_Shot_2016-05-24_at_3.19.52_PM.png) After: ![Screen_Shot_2016-05-24_at_3.20.13_PM](/uploads/f14f09918001bcbac2cd939b016479b2/Screen_Shot_2016-05-24_at_3.20.13_PM.png) Before: ![Screen_Shot_2016-05-24_at_3.20.48_PM](/uploads/c183ae2c491650c328eb5768f6a55fd9/Screen_Shot_2016-05-24_at_3.20.48_PM.png) After: ![Screen_Shot_2016-05-24_at_3.20.42_PM](/uploads/d3431a691768bae2c5244b9b632061b9/Screen_Shot_2016-05-24_at_3.20.42_PM.png) cc: @rspeicher @jschatz1 See merge request !4284
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/issues/_issue.html.haml2
-rw-r--r--app/views/projects/merge_requests/_merge_request.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 5cf70ea3bb7..78f64150601 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -6,7 +6,7 @@
.issue-title.title
%span.issue-title-text
= confidential_icon(issue)
- = link_to_gfm issue.title, issue_path(issue)
+ = link_to issue.title, issue_path(issue)
%ul.controls
- if issue.closed?
%li
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 2c54171c6bd..c02f94490a0 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -1,7 +1,7 @@
%li{ class: mr_css_classes(merge_request) }
.merge-request-title.title
%span.merge-request-title-text
- = link_to_gfm merge_request.title, merge_request_path(merge_request)
+ = link_to merge_request.title, merge_request_path(merge_request)
%ul.controls
- if merge_request.merged?
%li