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
a52936f3
Commit
a52936f3
authored
May 30, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renames resque resource to background_jobs
parent
84e4cfc6
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
18 deletions
+15
-18
app/controllers/admin/background_jobs_controller.rb
app/controllers/admin/background_jobs_controller.rb
+4
-0
app/controllers/admin/dashboard_controller.rb
app/controllers/admin/dashboard_controller.rb
+0
-3
app/controllers/admin/resque_controller.rb
app/controllers/admin/resque_controller.rb
+0
-4
app/views/admin/background_jobs/show.html.haml
app/views/admin/background_jobs/show.html.haml
+0
-0
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+8
-8
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+2
-2
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/controllers/admin/background_jobs_controller.rb
0 → 100644
View file @
a52936f3
class
Admin::BackgroundJobsController
<
Admin
::
ApplicationController
def
show
end
end
app/controllers/admin/dashboard_controller.rb
View file @
a52936f3
...
@@ -2,8 +2,5 @@ class Admin::DashboardController < Admin::ApplicationController
...
@@ -2,8 +2,5 @@ class Admin::DashboardController < Admin::ApplicationController
def
index
def
index
@projects
=
Project
.
order
(
"created_at DESC"
).
limit
(
10
)
@projects
=
Project
.
order
(
"created_at DESC"
).
limit
(
10
)
@users
=
User
.
order
(
"created_at DESC"
).
limit
(
10
)
@users
=
User
.
order
(
"created_at DESC"
).
limit
(
10
)
rescue
Redis
::
InheritedError
@resque_accessible
=
false
end
end
end
end
app/controllers/admin/resque_controller.rb
deleted
100644 → 0
View file @
84e4cfc6
class
Admin::ResqueController
<
Admin
::
ApplicationController
def
show
end
end
app/views/admin/
resque
/show.html.haml
→
app/views/admin/
background_jobs
/show.html.haml
View file @
a52936f3
File moved
app/views/admin/dashboard/index.html.haml
View file @
a52936f3
...
@@ -7,14 +7,6 @@
...
@@ -7,14 +7,6 @@
%h1
=
Project
.
count
%h1
=
Project
.
count
%hr
%hr
=
link_to
'New Project'
,
new_project_path
,
class:
"btn btn-small"
=
link_to
'New Project'
,
new_project_path
,
class:
"btn btn-small"
.span4
.ui-box
%h5
.title
Groups
.data.padded
=
link_to
admin_groups_path
do
%h1
=
Group
.
count
%hr
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-small"
.span4
.span4
.ui-box
.ui-box
%h5
.title
Users
%h5
.title
Users
...
@@ -23,6 +15,14 @@
...
@@ -23,6 +15,14 @@
%h1
=
User
.
count
%h1
=
User
.
count
%hr
%hr
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-small"
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-small"
.span4
.ui-box
%h5
.title
Groups
.data.padded
=
link_to
admin_groups_path
do
%h1
=
Group
.
count
%hr
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-small"
.row
.row
.span4
.span4
...
...
app/views/layouts/nav/_admin.html.haml
View file @
a52936f3
...
@@ -14,6 +14,6 @@
...
@@ -14,6 +14,6 @@
=
link_to
"Logs"
,
admin_logs_path
=
link_to
"Logs"
,
admin_logs_path
=
nav_link
(
controller: :hooks
)
do
=
nav_link
(
controller: :hooks
)
do
=
link_to
"Hooks"
,
admin_hooks_path
=
link_to
"Hooks"
,
admin_hooks_path
=
nav_link
(
controller: :
resque
)
do
=
nav_link
(
controller: :
background_jobs
)
do
=
link_to
"Background Jobs"
,
admin_
resque
_path
=
link_to
"Background Jobs"
,
admin_
background_jobs
_path
config/routes.rb
View file @
a52936f3
...
@@ -83,7 +83,7 @@ Gitlab::Application.routes.draw do
...
@@ -83,7 +83,7 @@ Gitlab::Application.routes.draw do
end
end
resource
:logs
,
only:
[
:show
]
resource
:logs
,
only:
[
:show
]
resource
:
resque
,
controller:
'resque
'
,
only:
[
:show
]
resource
:
background_jobs
,
controller:
'background_jobs
'
,
only:
[
:show
]
resources
:projects
,
constraints:
{
id:
/[a-zA-Z.\/0-9_\-]+/
},
only:
[
:index
,
:show
]
do
resources
:projects
,
constraints:
{
id:
/[a-zA-Z.\/0-9_\-]+/
},
only:
[
:index
,
:show
]
do
scope
module: :projects
,
constraints:
{
id:
/[a-zA-Z.\/0-9_\-]+/
}
do
scope
module: :projects
,
constraints:
{
id:
/[a-zA-Z.\/0-9_\-]+/
}
do
...
...
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