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
2f790001
Commit
2f790001
authored
Nov 12, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
project -> show refactor
parent
8786aff2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
17 deletions
+4
-17
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+2
-15
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+1
-1
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
No files found.
app/controllers/projects_controller.rb
View file @
2f790001
...
@@ -64,21 +64,8 @@ class ProjectsController < ApplicationController
...
@@ -64,21 +64,8 @@ class ProjectsController < ApplicationController
def
show
def
show
return
render
"projects/empty"
unless
@project
.
repo_exists?
return
render
"projects/empty"
unless
@project
.
repo_exists?
@date
=
case
params
[
:view
]
limit
=
(
params
[
:limit
]
||
40
).
to_i
when
"week"
then
Date
.
today
-
7
.
days
@activities
=
@project
.
updates
(
limit
)
when
"day"
then
Date
.
today
else
nil
end
if
@date
@date
=
@date
.
at_beginning_of_day
@commits
=
@project
.
commits_since
(
@date
)
@messages
=
project
.
notes
.
since
(
@date
).
order
(
"created_at DESC"
)
else
@commits
=
@project
.
fresh_commits
@messages
=
project
.
notes
.
fresh
.
limit
(
10
)
end
end
end
#
#
...
...
app/views/dashboard/index.html.haml
View file @
2f790001
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
=
image_tag
gravatar_icon
(
update
.
author_email
),
:class
=>
"left"
,
:width
=>
40
=
image_tag
gravatar_icon
(
update
.
author_email
),
:class
=>
"left"
,
:width
=>
40
%span
.update-title
%span
.update-title
-
if
update
.
kind_of?
(
Grit
::
Commit
)
-
if
update
.
kind_of?
(
Grit
::
Commit
)
%span
.tag.commit
=
update
.
head
.
name
%span
.
right.
tag.commit
=
update
.
head
.
name
=
dashboard_feed_title
(
update
)
=
dashboard_feed_title
(
update
)
%span
.update-author
%span
.update-author
%strong
=
update
.
author_name
%strong
=
update
.
author_name
...
...
app/views/projects/show.html.haml
View file @
2f790001
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
%span
>
%span
>
Activities
Activities
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
-
@
project
.
updates
(
20
)
.
each
do
|
update
|
-
@
activities
.
each
do
|
update
|
=
render
"projects/feed"
,
:update
=>
update
,
:project
=>
@project
=
render
"projects/feed"
,
:update
=>
update
,
:project
=>
@project
:javascript
:javascript
...
...
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