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
iv
gitlab-ce
Commits
eb06dd79
Commit
eb06dd79
authored
Aug 02, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update views for GFM
parent
20496491
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
19 additions
and
18 deletions
+19
-18
app/controllers/refs_controller.rb
app/controllers/refs_controller.rb
+1
-0
app/views/commits/_commit.html.haml
app/views/commits/_commit.html.haml
+1
-1
app/views/commits/_commit_box.html.haml
app/views/commits/_commit_box.html.haml
+2
-2
app/views/commits/index.atom.builder
app/views/commits/index.atom.builder
+1
-1
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+1
-1
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+1
-1
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+2
-2
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/_merge_request.html.haml
+1
-1
app/views/merge_requests/show/_mr_box.html.haml
app/views/merge_requests/show/_mr_box.html.haml
+1
-1
app/views/milestones/_milestone.html.haml
app/views/milestones/_milestone.html.haml
+1
-1
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+2
-2
app/views/refs/_tree_commit.html.haml
app/views/refs/_tree_commit.html.haml
+1
-1
app/views/refs/blame.html.haml
app/views/refs/blame.html.haml
+1
-1
app/views/repositories/_branch.html.haml
app/views/repositories/_branch.html.haml
+1
-1
app/views/repositories/_feed.html.haml
app/views/repositories/_feed.html.haml
+1
-1
app/views/repositories/tags.html.haml
app/views/repositories/tags.html.haml
+1
-1
No files found.
app/controllers/refs_controller.rb
View file @
eb06dd79
...
@@ -90,6 +90,7 @@ class RefsController < ApplicationController
...
@@ -90,6 +90,7 @@ class RefsController < ApplicationController
@repo
=
project
.
repo
@repo
=
project
.
repo
@commit
=
project
.
commit
(
@ref
)
@commit
=
project
.
commit
(
@ref
)
@commit
=
CommitDecorator
.
decorate
(
@commit
)
@tree
=
Tree
.
new
(
@commit
.
tree
,
project
,
@ref
,
params
[
:path
])
@tree
=
Tree
.
new
(
@commit
.
tree
,
project
,
@ref
,
params
[
:path
])
@tree
=
TreeDecorator
.
new
(
@tree
)
@tree
=
TreeDecorator
.
new
(
@tree
)
@hex_path
=
Digest
::
SHA1
.
hexdigest
(
params
[
:path
]
||
"/"
)
@hex_path
=
Digest
::
SHA1
.
hexdigest
(
params
[
:path
]
||
"/"
)
...
...
app/views/commits/_commit.html.haml
View file @
eb06dd79
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
%strong
.cgray
=
commit
.
author_name
%strong
.cgray
=
commit
.
author_name
–
–
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
16
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
16
=
link_to
truncate
(
commit
.
title
,
:length
=>
50
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
),
:class
=>
"row_title"
=
link_to
_gfm
truncate
(
commit
.
title
,
:length
=>
50
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
),
:class
=>
"row_title"
%span
.committed_ago
%span
.committed_ago
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
...
...
app/views/commits/_commit_box.html.haml
View file @
eb06dd79
...
@@ -11,10 +11,10 @@
...
@@ -11,10 +11,10 @@
=
link_to
tree_project_ref_path
(
@project
,
@commit
.
id
),
:class
=>
"browse-button primary grouped"
do
=
link_to
tree_project_ref_path
(
@project
,
@commit
.
id
),
:class
=>
"browse-button primary grouped"
do
%strong
Browse Code »
%strong
Browse Code »
%h3
.commit-title.page_title
%h3
.commit-title.page_title
=
commit_msg_with_link_to_issues
(
@project
,
@commit
.
title
)
=
gfm
@commit
.
title
-
if
@commit
.
description
.
present?
-
if
@commit
.
description
.
present?
%pre
.commit-description
%pre
.commit-description
=
commit_msg_with_link_to_issues
(
@project
,
@commit
.
description
)
=
gfm
@commit
.
description
.commit-info
.commit-info
.row
.row
.span4
.span4
...
...
app/views/commits/index.atom.builder
View file @
eb06dd79
...
@@ -17,7 +17,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
...
@@ -17,7 +17,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
xml.name commit.author_name
xml.name commit.author_name
xml.email commit.author_email
xml.email commit.author_email
end
end
xml.summary
commit.description
xml.summary
gfm(commit.description)
end
end
end
end
end
end
app/views/events/_commit.html.haml
View file @
eb06dd79
...
@@ -5,5 +5,5 @@
...
@@ -5,5 +5,5 @@
%strong
.cdark
=
commit
.
author_name
%strong
.cdark
=
commit
.
author_name
–
–
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
16
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
16
=
truncate
(
commit
.
title
,
:length
=>
50
)
rescue
"--broken encoding"
=
gfm
truncate
(
commit
.
title
,
:length
=>
50
),
project_commit_path
(
project
,
:id
=>
commit
.
id
)
rescue
"--broken encoding"
app/views/issues/_show.html.haml
View file @
eb06dd79
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
-
else
-
else
=
image_tag
"no_avatar.png"
,
:class
=>
"avatar"
=
image_tag
"no_avatar.png"
,
:class
=>
"avatar"
%p
=
link_to
truncate
(
issue
.
title
,
:length
=>
100
),
project_issue_path
(
issue
.
project
,
issue
),
:class
=>
"row_title"
%p
=
link_to
_gfm
truncate
(
issue
.
title
,
:length
=>
100
),
project_issue_path
(
issue
.
project
,
issue
),
:class
=>
"row_title"
%span
.update-author
%span
.update-author
%small
.cdark
=
"#
#{
issue
.
id
}
"
%small
.cdark
=
"#
#{
issue
.
id
}
"
...
...
app/views/issues/show.html.haml
View file @
eb06dd79
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
.alert-message.error.status_info
Closed
.alert-message.error.status_info
Closed
-
else
-
else
.alert-message.success.status_info
Open
.alert-message.success.status_info
Open
=
@issue
.
title
=
gfm
@issue
.
title
.middle_box_content
.middle_box_content
%cite
.cgray
Created by
%cite
.cgray
Created by
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
-
if
@issue
.
milestone
-
if
@issue
.
milestone
-
milestone
=
@issue
.
milestone
-
milestone
=
@issue
.
milestone
%cite
.cgray
and attached to milestone
%cite
.cgray
and attached to milestone
%strong
=
link_to
truncate
(
milestone
.
title
,
:length
=>
20
),
project_milestone_path
(
milestone
.
project
,
milestone
)
%strong
=
link_to
_gfm
truncate
(
milestone
.
title
,
:length
=>
20
),
project_milestone_path
(
milestone
.
project
,
milestone
)
.right
.right
-
@issue
.
labels
.
each
do
|
label
|
-
@issue
.
labels
.
each
do
|
label
|
...
...
app/views/merge_requests/_merge_request.html.haml
View file @
eb06dd79
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
=
merge_request
.
target_branch
=
merge_request
.
target_branch
=
image_tag
gravatar_icon
(
merge_request
.
author_email
),
:class
=>
"avatar"
=
image_tag
gravatar_icon
(
merge_request
.
author_email
),
:class
=>
"avatar"
%p
=
link_to
truncate
(
merge_request
.
title
,
:length
=>
80
),
project_merge_request_path
(
merge_request
.
project
,
merge_request
),
:class
=>
"row_title"
%p
=
link_to
_gfm
truncate
(
merge_request
.
title
,
:length
=>
80
),
project_merge_request_path
(
merge_request
.
project
,
merge_request
),
:class
=>
"row_title"
%span
.update-author
%span
.update-author
%small
.cdark
=
"#
#{
merge_request
.
id
}
"
%small
.cdark
=
"#
#{
merge_request
.
id
}
"
...
...
app/views/merge_requests/show/_mr_box.html.haml
View file @
eb06dd79
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.alert-message.error.status_info
Closed
.alert-message.error.status_info
Closed
-
else
-
else
.alert-message.success.status_info
Open
.alert-message.success.status_info
Open
=
@merge_request
.
title
=
gfm
@merge_request
.
title
.middle_box_content
.middle_box_content
%div
%div
...
...
app/views/milestones/_milestone.html.haml
View file @
eb06dd79
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-
if
can?
current_user
,
:admin_milestone
,
milestone
.
project
-
if
can?
current_user
,
:admin_milestone
,
milestone
.
project
=
link_to
'Edit'
,
edit_project_milestone_path
(
milestone
.
project
,
milestone
),
:class
=>
"btn small edit-milestone-link grouped"
=
link_to
'Edit'
,
edit_project_milestone_path
(
milestone
.
project
,
milestone
),
:class
=>
"btn small edit-milestone-link grouped"
%h4
%h4
=
link_to
truncate
(
milestone
.
title
,
:length
=>
100
),
project_milestone_path
(
milestone
.
project
,
milestone
),
:class
=>
"row_title"
=
link_to
_gfm
truncate
(
milestone
.
title
,
:length
=>
100
),
project_milestone_path
(
milestone
.
project
,
milestone
),
:class
=>
"row_title"
%small
%small
=
milestone
.
expires_at
=
milestone
.
expires_at
%br
%br
...
...
app/views/milestones/show.html.haml
View file @
eb06dd79
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
.alert-message.error.status_info
Closed
.alert-message.error.status_info
Closed
-
else
-
else
.alert-message.success.status_info
Open
.alert-message.success.status_info
Open
=
@milestone
.
title
=
gfm
@milestone
.
title
%small
.right
=
@milestone
.
expires_at
%small
.right
=
@milestone
.
expires_at
.middle_box_content
.middle_box_content
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
=
link_to
[
@project
,
issue
]
do
=
link_to
[
@project
,
issue
]
do
%span
.badge.badge-info
##{issue.id}
%span
.badge.badge-info
##{issue.id}
–
–
=
link_to
truncate
(
issue
.
title
,
:length
=>
60
),
[
@project
,
issue
]
=
link_to
_gfm
truncate
(
issue
.
title
,
:length
=>
60
),
[
@project
,
issue
]
%br
%br
=
paginate
@issues
,
:theme
=>
"gitlab"
=
paginate
@issues
,
:theme
=>
"gitlab"
...
...
app/views/refs/_tree_commit.html.haml
View file @
eb06dd79
-
if
tm
-
if
tm
%strong
=
link_to
"[
#{
tm
.
user_name
}
]"
,
project_team_member_path
(
@project
,
tm
)
%strong
=
link_to
"[
#{
tm
.
user_name
}
]"
,
project_team_member_path
(
@project
,
tm
)
=
link_to
truncate
(
content_commit
.
title
,
:length
=>
tm
?
30
:
50
),
project_commit_path
(
@project
,
content_commit
.
id
),
:class
=>
"tree-commit-link"
=
link_to
_gfm
truncate
(
content_commit
.
title
,
:length
=>
tm
?
30
:
50
),
project_commit_path
(
@project
,
content_commit
.
id
),
:class
=>
"tree-commit-link"
app/views/refs/blame.html.haml
View file @
eb06dd79
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
%td
.blame_commit
%td
.blame_commit
%code
=
link_to
commit
.
short_id
,
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
%code
=
link_to
commit
.
short_id
,
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
=
link_to
truncate
(
commit
.
title
,
:length
=>
30
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
),
:class
=>
"row_title"
rescue
"--broken encoding"
=
link_to
_gfm
truncate
(
commit
.
title
,
:length
=>
30
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
),
:class
=>
"row_title"
rescue
"--broken encoding"
%td
.lines
%td
.lines
=
preserve
do
=
preserve
do
%pre
%pre
...
...
app/views/repositories/_branch.html.haml
View file @
eb06dd79
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
%code
=
commit
.
short_id
%code
=
commit
.
short_id
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
truncate
(
commit
.
title
,
:length
=>
40
)
=
gfm
truncate
(
commit
.
title
,
:length
=>
40
)
%td
%td
%span
.update-author.right
%span
.update-author.right
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
...
...
app/views/repositories/_feed.html.haml
View file @
eb06dd79
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
link_to
project_commits_path
(
@project
,
commit
.
id
)
do
=
link_to
project_commits_path
(
@project
,
commit
.
id
)
do
%code
=
commit
.
short_id
%code
=
commit
.
short_id
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
truncate
(
commit
.
title
,
:length
=>
40
)
=
gfm
truncate
(
commit
.
title
,
:length
=>
40
)
%td
%td
%span
.right.cgray
%span
.right.cgray
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
...
...
app/views/repositories/tags.html.haml
View file @
eb06dd79
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
link_to
project_commit_path
(
@project
,
commit
.
id
)
do
=
link_to
project_commit_path
(
@project
,
commit
.
id
)
do
%code
=
commit
.
short_id
%code
=
commit
.
short_id
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
truncate
(
commit
.
title
,
:length
=>
40
)
=
gfm
truncate
(
commit
.
title
,
:length
=>
40
)
%td
%td
%span
.update-author.right
%span
.update-author.right
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
...
...
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