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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
52268d1d
Commit
52268d1d
authored
Apr 19, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests and remove counters
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
324e5769
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+0
-2
features/steps/profile/active_tab.rb
features/steps/profile/active_tab.rb
+4
-0
No files found.
app/views/layouts/nav/_profile.html.haml
View file @
52268d1d
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
=
icon
(
'envelope-o fw'
)
=
icon
(
'envelope-o fw'
)
%span
%span
Emails
Emails
%span
.count
=
number_with_delimiter
(
current_user
.
emails
.
count
+
1
)
-
unless
current_user
.
ldap_user?
-
unless
current_user
.
ldap_user?
=
nav_link
(
controller: :passwords
)
do
=
nav_link
(
controller: :passwords
)
do
=
link_to
edit_profile_password_path
,
title:
'Password'
do
=
link_to
edit_profile_password_path
,
title:
'Password'
do
...
@@ -37,7 +36,6 @@
...
@@ -37,7 +36,6 @@
=
icon
(
'key fw'
)
=
icon
(
'key fw'
)
%span
%span
SSH Keys
SSH Keys
%span
.count
=
number_with_delimiter
(
current_user
.
keys
.
count
)
=
nav_link
(
controller: :preferences
)
do
=
nav_link
(
controller: :preferences
)
do
=
link_to
profile_preferences_path
,
title:
'Preferences'
do
=
link_to
profile_preferences_path
,
title:
'Preferences'
do
-# TODO (rspeicher): Better icon?
-# TODO (rspeicher): Better icon?
...
...
features/steps/profile/active_tab.rb
View file @
52268d1d
...
@@ -22,4 +22,8 @@ class Spinach::Features::ProfileActiveTab < Spinach::FeatureSteps
...
@@ -22,4 +22,8 @@ class Spinach::Features::ProfileActiveTab < Spinach::FeatureSteps
step
'the active main tab should be Audit Log'
do
step
'the active main tab should be Audit Log'
do
ensure_active_main_tab
(
'Audit Log'
)
ensure_active_main_tab
(
'Audit Log'
)
end
end
def
ensure_active_main_tab
(
content
)
expect
(
find
(
'.layout-nav li.active'
)).
to
have_content
(
content
)
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