Commit 44f07f63 authored by Fatih Acet's avatar Fatih Acet

Merge branch '32418-make-link-to-self-less-obvious' into 'master'

Change links to issuable meta to black

Closes #32418

See merge request !11505
parents e39edeb5 72d42944
...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
color: $gl-text-color; color: $gl-text-color;
line-height: 34px; line-height: 34px;
.author { a {
color: $gl-text-color;
}
.identifier {
color: $gl-text-color; color: $gl-text-color;
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= icon('angle-double-left') = icon('angle-double-left')
.issuable-meta .issuable-meta
= issuable_meta(@merge_request, @project, "Merge Request") = issuable_meta(@merge_request, @project, "Merge request")
- if can?(current_user, :update_merge_request, @merge_request) - if can?(current_user, :update_merge_request, @merge_request)
.issuable-actions .issuable-actions
......
---
title: Change links in issuable meta to black
merge_request:
author:
...@@ -138,7 +138,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps ...@@ -138,7 +138,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
end end
step 'I should be directed to the corresponding page' do step 'I should be directed to the corresponding page' do
page.should have_css('.identifier', text: 'Merge Request !1') page.should have_css('.identifier', text: 'Merge request !1')
# Merge request page loads and issues a number of Ajax requests # Merge request page loads and issues a number of Ajax requests
wait_for_ajax wait_for_ajax
end end
......
...@@ -90,7 +90,7 @@ describe 'New/edit merge request', feature: true, js: true do ...@@ -90,7 +90,7 @@ describe 'New/edit merge request', feature: true, js: true do
page.within '.issuable-meta' do page.within '.issuable-meta' do
merge_request = MergeRequest.find_by(source_branch: 'fix') merge_request = MergeRequest.find_by(source_branch: 'fix')
expect(page).to have_text("Merge Request #{merge_request.to_reference}") expect(page).to have_text("Merge request #{merge_request.to_reference}")
# compare paths because the host differ in test # compare paths because the host differ in test
expect(find_link(merge_request.to_reference)[:href]) expect(find_link(merge_request.to_reference)[:href])
.to end_with(merge_request_path(merge_request)) .to end_with(merge_request_path(merge_request))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment