summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-03 09:31:07 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-03 10:41:11 +0100
commit34769efa790ca39718c6ab218e8018a501f861ab (patch)
tree867add82dfba417d590688f34db88d0ed5ffa0e1
parentd49c8e8e3d0f0dee7886d421c91684d92f89c78e (diff)
downloadgitlab-ce-34769efa790ca39718c6ab218e8018a501f861ab.tar.gz
Change content of cross project label
-rw-r--r--app/helpers/labels_helper.rb4
-rw-r--r--spec/lib/banzai/filter/label_reference_filter_spec.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 37fc1dab876..93806ac199e 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -64,8 +64,8 @@ module LabelsHelper
end
def render_colored_cross_project_label(label)
- label_suffix = label.project.name
- label_suffix = " <i>&laquo; #{label_suffix}</i>"
+ label_suffix = label.project.name_with_namespace
+ label_suffix = " <i>in #{label_suffix}</i>"
render_colored_label(label, label_suffix)
end
diff --git a/spec/lib/banzai/filter/label_reference_filter_spec.rb b/spec/lib/banzai/filter/label_reference_filter_spec.rb
index 8786095fbe4..e2d21f53b7e 100644
--- a/spec/lib/banzai/filter/label_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/label_reference_filter_spec.rb
@@ -178,8 +178,8 @@ describe Banzai::Filter::LabelReferenceFilter, lib: true do
end
describe 'cross project label references' do
- let(:project_name) { 'Some project' }
- let(:another_project) { create(:empty_project, :public, name: project_name) }
+ let(:another_project) { create(:empty_project, :public) }
+ let(:project_name) { another_project.name_with_namespace }
let(:label) { create(:label, project: another_project, color: '#00ff00') }
let(:reference) { label.to_reference(project) }
@@ -198,7 +198,7 @@ describe Banzai::Filter::LabelReferenceFilter, lib: true do
end
it 'contains cross project content' do
- expect(result.css('a').first.text).to eq "#{label.name} « #{project_name}"
+ expect(result.css('a').first.text).to eq "#{label.name} in #{project_name}"
end
end
end