BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1ee69714
Commit
1ee69714
authored
Jan 14, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleaning dashboard files
parent
cbd78922
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
33 deletions
+1
-33
dashboard_controller.rb
app/controllers/dashboard_controller.rb
+1
-12
index.js.haml
app/views/dashboard/index.js.haml
+0
-7
issues.js.haml
app/views/dashboard/issues.js.haml
+0
-7
merge_requests.js.haml
app/views/dashboard/merge_requests.js.haml
+0
-7
No files found.
app/controllers/dashboard_controller.rb
View file @
1ee69714
class
DashboardController
<
ApplicationController
class
DashboardController
<
ApplicationController
respond_to
:
js
,
:
html
respond_to
:html
def
index
def
index
@projects
=
current_user
.
projects
.
all
@projects
=
current_user
.
projects
.
all
@active_projects
=
@projects
.
select
(
&
:repo_exists?
).
select
(
&
:last_activity_date_cached
).
sort_by
(
&
:last_activity_date_cached
).
reverse
@active_projects
=
@projects
.
select
(
&
:repo_exists?
).
select
(
&
:last_activity_date_cached
).
sort_by
(
&
:last_activity_date_cached
).
reverse
respond_to
do
|
format
|
format
.
html
format
.
js
{
no_cache_headers
}
end
end
end
# Get authored or assigned open merge requests
# Get authored or assigned open merge requests
def
merge_requests
def
merge_requests
@projects
=
current_user
.
projects
.
all
@projects
=
current_user
.
projects
.
all
@merge_requests
=
MergeRequest
.
where
(
"author_id = :id or assignee_id = :id"
,
:id
=>
current_user
.
id
).
opened
.
order
(
"created_at DESC"
).
limit
(
40
)
@merge_requests
=
MergeRequest
.
where
(
"author_id = :id or assignee_id = :id"
,
:id
=>
current_user
.
id
).
opened
.
order
(
"created_at DESC"
).
limit
(
40
)
respond_to
do
|
format
|
format
.
html
format
.
js
{
no_cache_headers
}
end
end
end
# Get only assigned issues
# Get only assigned issues
...
@@ -32,7 +22,6 @@ class DashboardController < ApplicationController
...
@@ -32,7 +22,6 @@ class DashboardController < ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
js
{
no_cache_headers
}
format
.
atom
{
render
:layout
=>
false
}
format
.
atom
{
render
:layout
=>
false
}
end
end
end
end
...
...
app/views/dashboard/index.js.haml
deleted
100644 → 0
View file @
cbd78922
:plain
$("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){
$("#news-feed").html("
#{
escape_javascript
(
render
(
:partial
=>
"projects_feed"
))
}
");
$("#feeds_content_holder").show("slide", { direction: "right" }, 150);
history.pushState({ path: this.path }, '', '
#{
dashboard_path
}
')
});
app/views/dashboard/issues.js.haml
deleted
100644 → 0
View file @
cbd78922
:plain
$("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){
$("#news-feed").html("
#{
escape_javascript
(
render
(
:partial
=>
"issues_feed"
))
}
");
$("#feeds_content_holder").show("slide", { direction: "right" }, 150);
history.pushState({ path: this.path }, '', '
#{
dashboard_issues_path
}
')
});
app/views/dashboard/merge_requests.js.haml
deleted
100644 → 0
View file @
cbd78922
:plain
$("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){
$("#news-feed").html("
#{
escape_javascript
(
render
(
:partial
=>
"merge_requests_feed"
))
}
");
$("#feeds_content_holder").show("slide", { direction: "right" }, 150);
history.pushState({ path: this.path }, '', '
#{
dashboard_merge_requests_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