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
08bba8e5
Commit
08bba8e5
authored
May 18, 2017
by
Annabel Dunstone Gray
Committed by
kushalpandya
May 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch '32465-center' into 'master'
recenter profile page nav links Closes #32465 See merge request !11464
parent
3eda0c4f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
show.html.haml
app/views/users/show.html.haml
+2
-2
No files found.
app/views/users/show.html.haml
View file @
08bba8e5
...
...
@@ -10,7 +10,7 @@
=
auto_discovery_link_tag
(
:atom
,
user_url
(
@user
,
format: :atom
),
title:
"
#{
@user
.
name
}
activity"
)
.user-profile
.cover-block.user-cover-block
.cover-block.user-cover-block
.layout-nav
.cover-controls
-
if
@user
==
current_user
=
link_to
profile_path
,
class:
'btn btn-gray has-tooltip'
,
title:
'Edit profile'
,
'aria-label'
:
'Edit profile'
do
...
...
@@ -82,7 +82,7 @@
.scrolling-tabs-container
.fade-left
=
icon
(
'angle-left'
)
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.
center.
user-profile-nav.scrolling-tabs
%ul
.nav-links.user-profile-nav.scrolling-tabs
%li
.js-activity-tab
=
link_to
user_path
,
data:
{
target:
'div#activity'
,
action:
'activity'
,
toggle:
'tab'
}
do
Activity
...
...
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