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
Jérome Perrin
gitlab-ce
Commits
7d0d60d3
Commit
7d0d60d3
authored
Nov 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'go-to-nav'
parents
77ef4855
e3aed912
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
17 additions
and
16 deletions
+17
-16
CHANGELOG
CHANGELOG
+1
-0
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+2
-2
app/views/layouts/nav/_group_settings.html.haml
app/views/layouts/nav/_group_settings.html.haml
+2
-2
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+2
-2
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+4
-4
app/views/layouts/nav/_project_settings.html.haml
app/views/layouts/nav/_project_settings.html.haml
+2
-2
features/steps/groups.rb
features/steps/groups.rb
+1
-1
features/steps/project/project.rb
features/steps/project/project.rb
+2
-2
features/steps/shared/project_tab.rb
features/steps/shared/project_tab.rb
+1
-1
No files found.
CHANGELOG
View file @
7d0d60d3
...
@@ -21,6 +21,7 @@ v 8.2.0 (unreleased)
...
@@ -21,6 +21,7 @@ v 8.2.0 (unreleased)
- Add "New file" link to dropdown on project page
- Add "New file" link to dropdown on project page
- Include commit logs in project search
- Include commit logs in project search
- Add "added", "modified" and "removed" properties to commit object in webhook
- Add "added", "modified" and "removed" properties to commit object in webhook
- Rename "Back to" links to "Go to" because its not always a case it point to place user come from
v 8.1.1
v 8.1.1
- Fix cloning Wiki repositories via HTTP (Stan Hu)
- Fix cloning Wiki repositories via HTTP (Stan Hu)
...
...
app/views/layouts/nav/_group.html.haml
View file @
7d0d60d3
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
=
nav_link
do
=
nav_link
do
=
link_to
root_path
,
title:
'
Back
to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
link_to
root_path
,
title:
'
Go
to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
=
icon
(
'caret-square-o-left fw'
)
%span
%span
Back
to dashboard
Go
to dashboard
%li
.separate-item
%li
.separate-item
...
...
app/views/layouts/nav/_group_settings.html.haml
View file @
7d0d60d3
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
=
nav_link
do
=
nav_link
do
=
link_to
group_path
(
@group
),
title:
'
Back
to group'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
link_to
group_path
(
@group
),
title:
'
Go
to group'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
=
icon
(
'caret-square-o-left fw'
)
%span
%span
Back
to group
Go
to group
%li
.separate-item
%li
.separate-item
...
...
app/views/layouts/nav/_profile.html.haml
View file @
7d0d60d3
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
=
nav_link
do
=
nav_link
do
=
link_to
root_path
,
title:
'
Back
to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
link_to
root_path
,
title:
'
Go
to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
=
icon
(
'caret-square-o-left fw'
)
%span
%span
Back
to dashboard
Go
to dashboard
%li
.separate-item
%li
.separate-item
...
...
app/views/layouts/nav/_project.html.haml
View file @
7d0d60d3
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
-
if
@project
.
group
-
if
@project
.
group
=
nav_link
do
=
nav_link
do
=
link_to
group_path
(
@project
.
group
),
title:
'
Back
to group'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
link_to
group_path
(
@project
.
group
),
title:
'
Go
to group'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
=
icon
(
'caret-square-o-left fw'
)
%span
%span
Back
to group
Go
to group
-
else
-
else
=
nav_link
do
=
nav_link
do
=
link_to
root_path
,
title:
'
Back
to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
link_to
root_path
,
title:
'
Go
to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
=
icon
(
'caret-square-o-left fw'
)
%span
%span
Back
to dashboard
Go
to dashboard
%li
.separate-item
%li
.separate-item
...
...
app/views/layouts/nav/_project_settings.html.haml
View file @
7d0d60d3
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
=
nav_link
do
=
nav_link
do
=
link_to
project_path
(
@project
),
title:
'
Back
to project'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
link_to
project_path
(
@project
),
title:
'
Go
to project'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
=
icon
(
'caret-square-o-left fw'
)
%span
%span
Back
to project
Go
to project
%li
.separate-item
%li
.separate-item
...
...
features/steps/groups.rb
View file @
7d0d60d3
...
@@ -6,7 +6,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
...
@@ -6,7 +6,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
include
Select2Helper
include
Select2Helper
step
'I should see back to dashboard button'
do
step
'I should see back to dashboard button'
do
expect
(
page
).
to
have_content
'
Back
to dashboard'
expect
(
page
).
to
have_content
'
Go
to dashboard'
end
end
step
'gitlab user "Mike"'
do
step
'gitlab user "Mike"'
do
...
...
features/steps/project/project.rb
View file @
7d0d60d3
...
@@ -124,11 +124,11 @@ class Spinach::Features::Project < Spinach::FeatureSteps
...
@@ -124,11 +124,11 @@ class Spinach::Features::Project < Spinach::FeatureSteps
end
end
step
'I should see back to dashboard button'
do
step
'I should see back to dashboard button'
do
expect
(
page
).
to
have_content
'
Back
to dashboard'
expect
(
page
).
to
have_content
'
Go
to dashboard'
end
end
step
'I should see back to group button'
do
step
'I should see back to group button'
do
expect
(
page
).
to
have_content
'
Back
to group'
expect
(
page
).
to
have_content
'
Go
to group'
end
end
step
'I click notifications drop down button'
do
step
'I click notifications drop down button'
do
...
...
features/steps/shared/project_tab.rb
View file @
7d0d60d3
...
@@ -46,7 +46,7 @@ module SharedProjectTab
...
@@ -46,7 +46,7 @@ module SharedProjectTab
step
'the active main tab should be Settings'
do
step
'the active main tab should be Settings'
do
page
.
within
'.nav-sidebar'
do
page
.
within
'.nav-sidebar'
do
expect
(
page
).
to
have_content
(
'
Back
to project'
)
expect
(
page
).
to
have_content
(
'
Go
to project'
)
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