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
a57bf9bd
Commit
a57bf9bd
authored
Feb 18, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename menu item and page 'Task queue' to 'Tasks'
parent
fc3f8a8f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
app/views/dashboard/tasks/index.html.haml
app/views/dashboard/tasks/index.html.haml
+2
-2
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+6
-6
features/dashboard/tasks.feature
features/dashboard/tasks.feature
+1
-1
features/steps/dashboard/tasks.rb
features/steps/dashboard/tasks.rb
+1
-1
No files found.
app/views/dashboard/tasks/index.html.haml
View file @
a57bf9bd
-
page_title
"Task
Queue
"
-
header_title
"Task
Queue
"
,
dashboard_tasks_path
-
page_title
"Task
s
"
-
header_title
"Task
s
"
,
dashboard_tasks_path
.top-area
%ul
.nav-links
...
...
app/views/layouts/header/_default.html.haml
View file @
a57bf9bd
...
...
@@ -22,7 +22,7 @@
=
link_to
admin_root_path
,
title:
'Admin Area'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'wrench fw'
)
%li
=
link_to
dashboard_tasks_path
,
title:
'Task
Queue
'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
dashboard_tasks_path
,
title:
'Task
s
'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
%span
.badge.tasks-pending-count
=
tasks_pending_count
-
if
current_user
.
can_create_project?
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
a57bf9bd
...
...
@@ -4,6 +4,12 @@
=
icon
(
'home fw'
)
%span
Projects
=
nav_link
(
controller: :tasks
)
do
=
link_to
dashboard_tasks_path
,
title:
'Tasks'
do
=
icon
(
'bell fw'
)
%span
Tasks
%span
.count
=
number_with_delimiter
(
tasks_pending_count
)
=
nav_link
(
path:
'dashboard#activity'
)
do
=
link_to
activity_dashboard_path
,
class:
'shortcuts-activity'
,
title:
'Activity'
do
=
icon
(
'dashboard fw'
)
...
...
@@ -31,12 +37,6 @@
%span
Merge Requests
%span
.count
=
number_with_delimiter
(
current_user
.
assigned_merge_requests
.
opened
.
count
)
=
nav_link
(
path:
'dashboard#tasks'
)
do
=
link_to
dashboard_tasks_path
,
title:
'Task Queue'
do
=
icon
(
'bell fw'
)
%span
Task Queue
%span
.count
=
number_with_delimiter
(
tasks_pending_count
)
=
nav_link
(
controller: :snippets
)
do
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
=
icon
(
'clipboard fw'
)
...
...
features/dashboard/task
_queue
.feature
→
features/dashboard/task
s
.feature
View file @
a57bf9bd
@dashboard
Feature
:
Dashboard Task
Queue
Feature
:
Dashboard Task
s
Background
:
Given
I sign in as a user
And
I own project
"Shop"
...
...
features/steps/dashboard/task
_queue
.rb
→
features/steps/dashboard/task
s
.rb
View file @
a57bf9bd
class
Spinach::Features::DashboardTask
Queue
<
Spinach
::
FeatureSteps
class
Spinach::Features::DashboardTask
s
<
Spinach
::
FeatureSteps
include
SharedAuthentication
include
SharedPaths
include
SharedProject
...
...
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