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
9219ac0a
Commit
9219ac0a
authored
Jan 01, 2018
by
Rob Watson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add breadcrumbs to User Settings sub-views
Closes #40274
parent
ff077cf7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
0 deletions
+18
-0
app/views/doorkeeper/applications/show.html.haml
app/views/doorkeeper/applications/show.html.haml
+2
-0
app/views/profiles/keys/show.html.haml
app/views/profiles/keys/show.html.haml
+2
-0
changelogs/unreleased/40274-user-settings-breadcrumbs.yml
changelogs/unreleased/40274-user-settings-breadcrumbs.yml
+5
-0
spec/features/profiles/keys_spec.rb
spec/features/profiles/keys_spec.rb
+1
-0
spec/features/profiles/oauth_applications_spec.rb
spec/features/profiles/oauth_applications_spec.rb
+8
-0
No files found.
app/views/doorkeeper/applications/show.html.haml
View file @
9219ac0a
-
add_to_breadcrumbs
"Applications"
,
oauth_applications_path
-
breadcrumb_title
@application
.
name
-
page_title
@application
.
name
,
"Applications"
-
page_title
@application
.
name
,
"Applications"
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
@content_class
=
"limit-container-width"
unless
fluid_layout
...
...
app/views/profiles/keys/show.html.haml
View file @
9219ac0a
-
add_to_breadcrumbs
"SSH Keys"
,
profile_keys_path
-
breadcrumb_title
@key
.
title
-
page_title
@key
.
title
,
"SSH Keys"
-
page_title
@key
.
title
,
"SSH Keys"
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
@content_class
=
"limit-container-width"
unless
fluid_layout
=
render
'profiles/head'
=
render
'profiles/head'
...
...
changelogs/unreleased/40274-user-settings-breadcrumbs.yml
0 → 100644
View file @
9219ac0a
---
title
:
Fix breadcrumbs in User Settings
merge_request
:
16172
author
:
rfwatson
type
:
fixed
spec/features/profiles/keys_spec.rb
View file @
9219ac0a
...
@@ -27,6 +27,7 @@ feature 'Profile > SSH Keys' do
...
@@ -27,6 +27,7 @@ feature 'Profile > SSH Keys' do
expect
(
page
).
to
have_content
(
"Title:
#{
attrs
[
:title
]
}
"
)
expect
(
page
).
to
have_content
(
"Title:
#{
attrs
[
:title
]
}
"
)
expect
(
page
).
to
have_content
(
attrs
[
:key
])
expect
(
page
).
to
have_content
(
attrs
[
:key
])
expect
(
find
(
'.breadcrumbs-sub-title'
)).
to
have_link
(
attrs
[
:title
])
end
end
context
'when only DSA and ECDSA keys are allowed'
do
context
'when only DSA and ECDSA keys are allowed'
do
...
...
spec/features/profiles/oauth_applications_spec.rb
View file @
9219ac0a
...
@@ -2,12 +2,20 @@ require 'spec_helper'
...
@@ -2,12 +2,20 @@ require 'spec_helper'
describe
'Profile > Applications'
do
describe
'Profile > Applications'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:application
)
{
create
(
:oauth_application
,
owner:
user
)
}
before
do
before
do
sign_in
(
user
)
sign_in
(
user
)
end
end
describe
'User manages applications'
,
:js
do
describe
'User manages applications'
,
:js
do
it
'views an application'
do
visit
oauth_application_path
(
application
)
expect
(
page
).
to
have_content
(
"Application:
#{
application
.
name
}
"
)
expect
(
find
(
'.breadcrumbs-sub-title'
)).
to
have_link
(
application
.
name
)
end
it
'deletes an application'
do
it
'deletes an application'
do
create
(
:oauth_application
,
owner:
user
)
create
(
:oauth_application
,
owner:
user
)
visit
oauth_applications_path
visit
oauth_applications_path
...
...
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