From 0b661516324862506d5ec30c44cac704346a90ad Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 5 Jan 2016 16:45:53 +0100
Subject: [PATCH] Remove icon from milestone reference.
---
app/models/milestone.rb | 2 +-
app/views/shared/issuable/_sidebar.html.haml | 3 ++-
lib/banzai/filter/milestone_reference_filter.rb | 2 --
spec/lib/banzai/filter/milestone_reference_filter_spec.rb | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index e47b6440746..eaa2db2e247 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -76,7 +76,7 @@ class Milestone < ActiveRecord::Base
end
def reference_link_text(from_project = nil)
- %Q{<i class="fa fa-clock-o"></i> }.html_safe + self.title
+ self.title
end
def expired?
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 9d65a621e53..79c5cc7f40a 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -28,7 +28,8 @@
%span.back-to-milestone
= link_to namespace_project_milestone_path(@project.namespace, @project, issuable.milestone) do
%strong
- = issuable.milestone.reference_link_text
+ = icon('clock-o')
+ = issuable.milestone.title
- else
.light None
.selectbox
diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index f99202af5e8..e88b27c1fae 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -3,8 +3,6 @@ require 'banzai'
module Banzai
module Filter
# HTML filter that replaces milestone references with links.
- #
- # This filter supports cross-project references.
class MilestoneReferenceFilter < AbstractReferenceFilter
def self.object_class
Milestone
diff --git a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
index c53e780d354..86b71210100 100644
--- a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb
@@ -29,7 +29,7 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
it 'links with adjacent text' do
doc = reference_filter("milestone (#{reference}.)")
- expect(doc.to_html).to match(/\(<a.+><i.+><\/i> #{Regexp.escape(milestone.title)}<\/a>\.\)/)
+ expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(milestone.title)}<\/a>\.\)/)
end
it 'includes a title attribute' do
@@ -41,7 +41,7 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
milestone.update_attribute(:title, %{"></a>whatever<a title="})
doc = reference_filter("milestone #{reference}")
- expect(doc.text).to eq "milestone #{milestone.title}"
+ expect(doc.text).to eq "milestone #{milestone.title}"
end
it 'includes default classes' do
--
GitLab