Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
e4e824c1
Commit
e4e824c1
authored
Jul 23, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace author_link snake case in stylesheets, specs, and helpers
parent
f1c7ab51
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
9 deletions
+14
-9
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+1
-1
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+3
-3
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+2
-2
app/views/shared/notes/_notes_with_form.html.haml
app/views/shared/notes/_notes_with_form.html.haml
+1
-1
changelogs/unreleased/replace-snake-case-css-classes.yml
changelogs/unreleased/replace-snake-case-css-classes.yml
+5
-0
spec/features/issues/update_issues_spec.rb
spec/features/issues/update_issues_spec.rb
+1
-1
spec/features/merge_requests/user_mass_updates_spec.rb
spec/features/merge_requests/user_mass_updates_spec.rb
+1
-1
No files found.
app/assets/stylesheets/framework/lists.scss
View file @
e4e824c1
...
@@ -270,7 +270,7 @@ ul.controls {
...
@@ -270,7 +270,7 @@ ul.controls {
.issuable-pipeline-broken
a
,
.issuable-pipeline-broken
a
,
.issuable-pipeline-status
a
,
.issuable-pipeline-status
a
,
.author
_
link
{
.author
-
link
{
display
:
flex
;
display
:
flex
;
}
}
}
}
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
e4e824c1
...
@@ -486,7 +486,7 @@
...
@@ -486,7 +486,7 @@
padding-bottom
:
0
;
padding-bottom
:
0
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
.author
_
link
{
.author
-
link
{
padding-left
:
0
;
padding-left
:
0
;
.avatar
{
.avatar
{
...
@@ -595,7 +595,7 @@
...
@@ -595,7 +595,7 @@
margin
:
16px
0
0
;
margin
:
16px
0
0
;
font-size
:
85%
;
font-size
:
85%
;
.author
_
link
{
.author
-
link
{
color
:
$gray-darkest
;
color
:
$gray-darkest
;
}
}
}
}
...
@@ -620,7 +620,7 @@
...
@@ -620,7 +620,7 @@
padding-right
:
0
;
padding-right
:
0
;
}
}
.author
_
link
{
.author
-
link
{
display
:
block
;
display
:
block
;
}
}
...
...
app/helpers/projects_helper.rb
View file @
e4e824c1
...
@@ -63,10 +63,10 @@ module ProjectsHelper
...
@@ -63,10 +63,10 @@ module ProjectsHelper
author_html
=
author_html
.
html_safe
author_html
=
author_html
.
html_safe
if
opts
[
:name
]
if
opts
[
:name
]
link_to
(
author_html
,
user_path
(
author
),
class:
"author
_
link
#{
"
#{
opts
[
:extra_class
]
}
"
if
opts
[
:extra_class
]
}
#{
"
#{
opts
[
:mobile_classes
]
}
"
if
opts
[
:mobile_classes
]
}
"
).
html_safe
link_to
(
author_html
,
user_path
(
author
),
class:
"author
-
link
#{
"
#{
opts
[
:extra_class
]
}
"
if
opts
[
:extra_class
]
}
#{
"
#{
opts
[
:mobile_classes
]
}
"
if
opts
[
:mobile_classes
]
}
"
).
html_safe
else
else
title
=
opts
[
:title
].
sub
(
":name"
,
sanitize
(
author
.
name
))
title
=
opts
[
:title
].
sub
(
":name"
,
sanitize
(
author
.
name
))
link_to
(
author_html
,
user_path
(
author
),
class:
"author
_
link has-tooltip"
,
title:
title
,
data:
{
container:
'body'
}).
html_safe
link_to
(
author_html
,
user_path
(
author
),
class:
"author
-
link has-tooltip"
,
title:
title
,
data:
{
container:
'body'
}).
html_safe
end
end
end
end
...
...
app/views/shared/notes/_notes_with_form.html.haml
View file @
e4e824c1
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
.flash-container.timeline-content
.flash-container.timeline-content
.timeline-icon.d-none.d-sm-none.d-md-block
.timeline-icon.d-none.d-sm-none.d-md-block
%a
.author
_
link
{
href:
user_path
(
current_user
)
}
%a
.author
-
link
{
href:
user_path
(
current_user
)
}
=
image_tag
avatar_icon_for_user
(
current_user
),
alt:
current_user
.
to_reference
,
class:
'avatar s40'
=
image_tag
avatar_icon_for_user
(
current_user
),
alt:
current_user
.
to_reference
,
class:
'avatar s40'
.timeline-content.timeline-content-form
.timeline-content.timeline-content-form
=
render
"shared/notes/form"
,
view:
diff_view
,
supports_autocomplete:
autocomplete
=
render
"shared/notes/form"
,
view:
diff_view
,
supports_autocomplete:
autocomplete
...
...
changelogs/unreleased/replace-snake-case-css-classes.yml
0 → 100644
View file @
e4e824c1
---
title
:
Replace author_link snake case in stylesheets, specs, and helpers
merge_request
:
20797
author
:
George Tsiolis
type
:
other
spec/features/issues/update_issues_spec.rb
View file @
e4e824c1
...
@@ -63,7 +63,7 @@ describe 'Multiple issue updating from issues#index', :js do
...
@@ -63,7 +63,7 @@ describe 'Multiple issue updating from issues#index', :js do
click_link
'Unassigned'
click_link
'Unassigned'
click_update_issues_button
click_update_issues_button
expect
(
find
(
'.issue:first-child .controls'
)).
not_to
have_css
(
'.author
_
link'
)
expect
(
find
(
'.issue:first-child .controls'
)).
not_to
have_css
(
'.author
-
link'
)
end
end
end
end
...
...
spec/features/merge_requests/user_mass_updates_spec.rb
View file @
e4e824c1
...
@@ -62,7 +62,7 @@ describe 'Merge requests > User mass updates', :js do
...
@@ -62,7 +62,7 @@ describe 'Merge requests > User mass updates', :js do
it
'removes assignee from the merge request'
do
it
'removes assignee from the merge request'
do
change_assignee
(
'Unassigned'
)
change_assignee
(
'Unassigned'
)
expect
(
find
(
'.merge-request .controls'
)).
not_to
have_css
(
'.author
_
link'
)
expect
(
find
(
'.merge-request .controls'
)).
not_to
have_css
(
'.author
-
link'
)
end
end
end
end
end
end
...
...
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