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
Kazuhiko Shiozaki
gitlab-ce
Commits
b53557ac
Commit
b53557ac
authored
Mar 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove decorator calls and methods from views. Repalace with helper calls when needed
parent
da5b0c91
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
18 additions
and
21 deletions
+18
-21
app/views/blame/show.html.haml
app/views/blame/show.html.haml
+2
-2
app/views/commit/_commit_box.html.haml
app/views/commit/_commit_box.html.haml
+2
-2
app/views/commits/_commit.html.haml
app/views/commits/_commit.html.haml
+1
-1
app/views/commits/show.html.haml
app/views/commits/show.html.haml
+1
-1
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+0
-1
app/views/repositories/_branch.html.haml
app/views/repositories/_branch.html.haml
+1
-2
app/views/repositories/_feed.html.haml
app/views/repositories/_feed.html.haml
+0
-1
app/views/repositories/tags.html.haml
app/views/repositories/tags.html.haml
+1
-2
app/views/tree/_tree.html.haml
app/views/tree/_tree.html.haml
+2
-2
app/views/tree/_tree_commit_column.html.haml
app/views/tree/_tree_commit_column.html.haml
+1
-1
app/views/wikis/history.html.haml
app/views/wikis/history.html.haml
+3
-2
app/views/wikis/pages.html.haml
app/views/wikis/pages.html.haml
+2
-2
app/views/wikis/show.html.haml
app/views/wikis/show.html.haml
+2
-2
No files found.
app/views/blame/show.html.haml
View file @
b53557ac
...
@@ -22,13 +22,13 @@
...
@@ -22,13 +22,13 @@
%table
%table
-
current_line
=
1
-
current_line
=
1
-
@blame
.
each
do
|
commit
,
lines
|
-
@blame
.
each
do
|
commit
,
lines
|
-
commit
=
Commit
Decorator
.
decorate
(
Commit
.
new
(
commit
)
)
-
commit
=
Commit
.
new
(
commit
)
%tr
%tr
%td
.blame-commit
%td
.blame-commit
%span
.commit
%span
.commit
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
@project
,
commit
),
class:
"commit_short_id"
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
@project
,
commit
),
class:
"commit_short_id"
=
commit
.
author_link
avatar:
true
,
size:
16
=
commit
_author_link
(
commit
,
avatar:
true
,
size:
16
)
=
link_to_gfm
truncate
(
commit
.
title
,
length:
20
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
20
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
%td
.lines.blame-numbers
%td
.lines.blame-numbers
...
...
app/views/commit/_commit_box.html.haml
View file @
b53557ac
...
@@ -24,14 +24,14 @@
...
@@ -24,14 +24,14 @@
.row
.row
.span5
.span5
.author
.author
=
@commit
.
author_link
avatar:
true
,
size:
32
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
32
)
authored
authored
%time
{
title:
@commit
.
authored_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
%time
{
title:
@commit
.
authored_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
authored_date
)
}
ago
#{
time_ago_in_words
(
@commit
.
authored_date
)
}
ago
-
if
@commit
.
different_committer?
-
if
@commit
.
different_committer?
.committer
.committer
→
→
=
@commit
.
committer_link
=
commit_committer_link
(
@commit
)
committed
committed
%time
{
title:
@commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
%time
{
title:
@commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
committed_date
)
}
ago
#{
time_ago_in_words
(
@commit
.
committed_date
)
}
ago
...
...
app/views/commits/_commit.html.haml
View file @
b53557ac
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%strong
=
link_to
"Browse Code »"
,
project_tree_path
(
@project
,
commit
),
class:
"right"
%strong
=
link_to
"Browse Code »"
,
project_tree_path
(
@project
,
commit
),
class:
"right"
%p
%p
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
@project
,
commit
),
class:
"commit_short_id"
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
@project
,
commit
),
class:
"commit_short_id"
=
commit
.
author_link
avatar:
true
,
size:
24
=
commit
_author_link
(
commit
,
avatar:
true
,
size:
24
)
=
link_to_gfm
truncate
(
commit
.
title
,
length:
70
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
70
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
...
...
app/views/commits/show.html.haml
View file @
b53557ac
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
if
@path
.
present?
-
if
@path
.
present?
%ul
.breadcrumb
%ul
.breadcrumb
=
breadcrumbs
=
commits_
breadcrumbs
%div
{
id:
dom_id
(
@project
)}
%div
{
id:
dom_id
(
@project
)}
#commits-list
=
render
"commits"
#commits-list
=
render
"commits"
...
...
app/views/events/_commit.html.haml
View file @
b53557ac
-
commit
=
CommitDecorator
.
decorate
(
commit
)
%li
.commit
%li
.commit
%p
%p
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
project
,
commit
),
class:
"commit_short_id"
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
project
,
commit
),
class:
"commit_short_id"
...
...
app/views/repositories/_branch.html.haml
View file @
b53557ac
-
commit
=
Commit
.
new
(
branch
.
commit
)
-
commit
=
Commit
.
new
(
Gitlab
::
Git
::
Commit
.
new
(
branch
.
commit
))
-
commit
=
CommitDecorator
.
decorate
(
commit
)
%tr
%tr
%td
%td
=
link_to
project_commits_path
(
@project
,
branch
.
name
)
do
=
link_to
project_commits_path
(
@project
,
branch
.
name
)
do
...
...
app/views/repositories/_feed.html.haml
View file @
b53557ac
-
commit
=
update
-
commit
=
update
-
commit
=
CommitDecorator
.
new
(
commit
)
%tr
%tr
%td
%td
=
link_to
project_commits_path
(
@project
,
commit
.
head
.
name
)
do
=
link_to
project_commits_path
(
@project
,
commit
.
head
.
name
)
do
...
...
app/views/repositories/tags.html.haml
View file @
b53557ac
...
@@ -7,8 +7,7 @@
...
@@ -7,8 +7,7 @@
%th
Last commit
%th
Last commit
%th
%th
-
@tags
.
each
do
|
tag
|
-
@tags
.
each
do
|
tag
|
-
commit
=
Commit
.
new
(
tag
.
commit
)
-
commit
=
Commit
.
new
(
Gitlab
::
Git
::
Commit
.
new
(
tag
.
commit
))
-
commit
=
CommitDecorator
.
decorate
(
commit
)
%tr
%tr
%td
%td
%strong
%strong
...
...
app/views/tree/_tree.html.haml
View file @
b53557ac
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
%i
.icon-angle-right
%i
.icon-angle-right
=
link_to
project_tree_path
(
@project
,
@ref
)
do
=
link_to
project_tree_path
(
@project
,
@ref
)
do
=
@project
.
path
=
@project
.
path
-
tree
.
breadcrumbs
(
6
)
do
|
title
,
path
|
-
tree
_breadcrumbs
(
tree
,
6
)
do
|
title
,
path
|
\/
\/
%li
%li
-
if
path
-
if
path
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
%tr
.tree-item
%tr
.tree-item
%td
.tree-item-file-name
%td
.tree-item-file-name
=
image_tag
"file_empty.png"
,
size:
'16x16'
=
image_tag
"file_empty.png"
,
size:
'16x16'
=
link_to
".."
,
project_tree_path
(
@project
,
tree
.
up_dir_path
)
=
link_to
".."
,
project_tree_path
(
@project
,
up_dir_path
(
tree
)
)
%td
%td
%td
%td
%td
%td
...
...
app/views/tree/_tree_commit_column.html.haml
View file @
b53557ac
%span
.tree_author
=
commit
.
author_link
avatar:
true
%span
.tree_author
=
commit
_author_link
(
commit
,
avatar:
true
)
=
link_to_gfm
truncate
(
commit
.
title
,
length:
80
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"tree-commit-link"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
80
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"tree-commit-link"
app/views/wikis/history.html.haml
View file @
b53557ac
...
@@ -14,12 +14,13 @@
...
@@ -14,12 +14,13 @@
%th
Format
%th
Format
%tbody
%tbody
-
@wiki
.
versions
.
each
do
|
version
|
-
@wiki
.
versions
.
each
do
|
version
|
-
commit
=
CommitDecorator
.
new
(
version
)
-
commit
=
version
%tr
%tr
%td
%td
=
link_to
project_wiki_path
(
@project
,
@wiki
,
version_id:
commit
.
id
)
do
=
link_to
project_wiki_path
(
@project
,
@wiki
,
version_id:
commit
.
id
)
do
=
commit
.
short_id
=
commit
.
short_id
%td
=
commit
.
author_link
avatar:
true
,
size:
24
%td
=
commit_author_link
(
commit
,
avatar:
true
,
size:
24
)
%td
%td
=
commit
.
title
=
commit
.
title
%td
%td
...
...
app/views/wikis/pages.html.haml
View file @
b53557ac
...
@@ -21,5 +21,5 @@
...
@@ -21,5 +21,5 @@
=
wiki_page
.
created_at
.
to_s
(
:short
)
do
=
wiki_page
.
created_at
.
to_s
(
:short
)
do
(
#{
time_ago_in_words
(
wiki_page
.
created_at
)
}
(
#{
time_ago_in_words
(
wiki_page
.
created_at
)
}
ago)
ago)
-
commit
=
CommitDecorator
.
decorate
(
wiki_page
.
version
)
%td
%td
=
commit
.
author_link
avatar:
true
,
size:
24
=
commit_author_link
(
wiki_page
.
version
,
avatar:
true
,
size:
24
)
app/views/wikis/show.html.haml
View file @
b53557ac
...
@@ -13,5 +13,5 @@
...
@@ -13,5 +13,5 @@
=
preserve
do
=
preserve
do
=
render_wiki_content
(
@wiki
)
=
render_wiki_content
(
@wiki
)
-
commit
=
Commit
Decorator
.
new
(
@wiki
.
version
)
-
commit
=
Commit
.
new
(
@wiki
.
version
)
%p
.time
Last edited by
#{
commit
.
author_link
(
avatar:
true
,
size:
16
)
}
#{
time_ago_in_words
@wiki
.
created_at
}
ago
%p
.time
Last edited by
#{
commit
_author_link
(
commit
,
avatar:
true
,
size:
16
)
}
#{
time_ago_in_words
@wiki
.
created_at
}
ago
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