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
Boxiang Sun
gitlab-ce
Commits
3b2adb5b
Commit
3b2adb5b
authored
Apr 19, 2017
by
Dimitrie Hoekstra
Committed by
Annabel Dunstone Gray
Apr 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added profile name to user dropdown
parent
364050c1
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
7 deletions
+24
-7
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+4
-0
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+8
-0
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+0
-4
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+5
-0
changelogs/unreleased/30484-profile-dropdown-account-name.yml
...gelogs/unreleased/30484-profile-dropdown-account-name.yml
+4
-0
features/steps/group/members.rb
features/steps/group/members.rb
+2
-2
spec/features/admin/admin_projects_spec.rb
spec/features/admin/admin_projects_spec.rb
+1
-1
No files found.
app/assets/stylesheets/framework/common.scss
View file @
3b2adb5b
...
@@ -40,6 +40,10 @@
...
@@ -40,6 +40,10 @@
line-height
:
24px
;
line-height
:
24px
;
}
}
.bold
{
font-weight
:
600
;
}
.tab-content
{
.tab-content
{
overflow
:
visible
;
overflow
:
visible
;
}
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
3b2adb5b
...
@@ -331,6 +331,14 @@ header {
...
@@ -331,6 +331,14 @@ header {
.dropdown-menu-nav
{
.dropdown-menu-nav
{
min-width
:
140px
;
min-width
:
140px
;
margin-top
:
-5px
;
margin-top
:
-5px
;
.current-user
{
padding
:
5px
18px
;
.user-name
{
display
:
block
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
3b2adb5b
...
@@ -210,10 +210,6 @@
...
@@ -210,10 +210,6 @@
}
}
}
}
.bold
{
font-weight
:
600
;
}
.light
{
.light
{
font-weight
:
normal
;
font-weight
:
normal
;
}
}
...
...
app/views/layouts/header/_default.html.haml
View file @
3b2adb5b
...
@@ -67,6 +67,11 @@
...
@@ -67,6 +67,11 @@
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
.dropdown-menu-nav.dropdown-menu-align-right
.dropdown-menu-nav.dropdown-menu-align-right
%ul
%ul
%li
.current-user
.user-name.bold
=
current_user
.
name
@
#{
current_user
.
username
}
%li
.divider
%li
%li
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
aria:
{
label:
"Profile"
},
data:
{
user:
current_user
.
username
}
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
aria:
{
label:
"Profile"
},
data:
{
user:
current_user
.
username
}
%li
%li
...
...
changelogs/unreleased/30484-profile-dropdown-account-name.yml
0 → 100644
View file @
3b2adb5b
---
title
:
Added profile name to user dropdown
merge_request
:
author
:
features/steps/group/members.rb
View file @
3b2adb5b
...
@@ -87,7 +87,7 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
...
@@ -87,7 +87,7 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
end
end
step
'I click on the "Remove User From Group" button for "John Doe"'
do
step
'I click on the "Remove User From Group" button for "John Doe"'
do
find
(
:css
,
'li'
,
text:
"John Doe"
).
find
(
:css
,
'a.btn-remove'
).
click
find
(
:css
,
'
.project-members-page
li'
,
text:
"John Doe"
).
find
(
:css
,
'a.btn-remove'
).
click
# poltergeist always confirms popups.
# poltergeist always confirms popups.
end
end
...
@@ -97,7 +97,7 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
...
@@ -97,7 +97,7 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
end
end
step
'I should not see the "Remove User From Group" button for "John Doe"'
do
step
'I should not see the "Remove User From Group" button for "John Doe"'
do
expect
(
find
(
:css
,
'li'
,
text:
"John Doe"
)).
not_to
have_selector
(
:css
,
'a.btn-remove'
)
expect
(
find
(
:css
,
'
.project-members-page
li'
,
text:
"John Doe"
)).
not_to
have_selector
(
:css
,
'a.btn-remove'
)
# poltergeist always confirms popups.
# poltergeist always confirms popups.
end
end
...
...
spec/features/admin/admin_projects_spec.rb
View file @
3b2adb5b
...
@@ -109,7 +109,7 @@ describe "Admin::Projects", feature: true do
...
@@ -109,7 +109,7 @@ describe "Admin::Projects", feature: true do
expect
(
page
).
to
have_content
(
'Developer'
)
expect
(
page
).
to
have_content
(
'Developer'
)
end
end
find
(
:css
,
'li'
,
text:
current_user
.
name
).
find
(
:css
,
'a.btn-remove'
).
click
find
(
:css
,
'
.content-list
li'
,
text:
current_user
.
name
).
find
(
:css
,
'a.btn-remove'
).
click
expect
(
page
).
not_to
have_selector
(
:css
,
'.content-list'
)
expect
(
page
).
not_to
have_selector
(
:css
,
'.content-list'
)
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