BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
44f07f63
Commit
44f07f63
authored
May 22, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
detail_page.scss
app/assets/stylesheets/pages/detail_page.scss
+1
-5
_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+1
-1
32418-make-link-to-self-less-obvious.yml
...elogs/unreleased/32418-make-link-to-self-less-obvious.yml
+4
-0
todos.rb
features/steps/dashboard/todos.rb
+1
-1
form_spec.rb
spec/features/merge_requests/form_spec.rb
+1
-1
No files found.
app/assets/stylesheets/pages/detail_page.scss
View file @
44f07f63
...
...
@@ -4,11 +4,7 @@
color
:
$gl-text-color
;
line-height
:
34px
;
.author
{
color
:
$gl-text-color
;
}
.identifier
{
a
{
color
:
$gl-text-color
;
}
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
44f07f63
...
...
@@ -13,7 +13,7 @@
=
icon
(
'angle-double-left'
)
.issuable-meta
=
issuable_meta
(
@merge_request
,
@project
,
"Merge
R
equest"
)
=
issuable_meta
(
@merge_request
,
@project
,
"Merge
r
equest"
)
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
.issuable-actions
...
...
changelogs/unreleased/32418-make-link-to-self-less-obvious.yml
0 → 100644
View file @
44f07f63
---
title
:
Change links in issuable meta to black
merge_request
:
author
:
features/steps/dashboard/todos.rb
View file @
44f07f63
...
...
@@ -138,7 +138,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
end
step
'I should be directed to the corresponding page'
do
page
.
should
have_css
(
'.identifier'
,
text:
'Merge
R
equest !1'
)
page
.
should
have_css
(
'.identifier'
,
text:
'Merge
r
equest !1'
)
# Merge request page loads and issues a number of Ajax requests
wait_for_ajax
end
...
...
spec/features/merge_requests/form_spec.rb
View file @
44f07f63
...
...
@@ -90,7 +90,7 @@ describe 'New/edit merge request', feature: true, js: true do
page
.
within
'.issuable-meta'
do
merge_request
=
MergeRequest
.
find_by
(
source_branch:
'fix'
)
expect
(
page
).
to
have_text
(
"Merge
R
equest
#{
merge_request
.
to_reference
}
"
)
expect
(
page
).
to
have_text
(
"Merge
r
equest
#{
merge_request
.
to_reference
}
"
)
# compare paths because the host differ in test
expect
(
find_link
(
merge_request
.
to_reference
)[
:href
])
.
to
end_with
(
merge_request_path
(
merge_request
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment