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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f69049c2
Commit
f69049c2
authored
Jul 27, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased
Break up links with nested formating (rebased)
parents
34e33273
f6a67ef2
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
33 additions
and
41 deletions
+33
-41
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+2
-2
app/assets/stylesheets/sections/issues.scss
app/assets/stylesheets/sections/issues.scss
+1
-1
app/views/commits/_commit.html.haml
app/views/commits/_commit.html.haml
+10
-11
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+6
-7
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+1
-2
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+1
-3
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/_merge_request.html.haml
+1
-2
app/views/milestones/_milestone.html.haml
app/views/milestones/_milestone.html.haml
+7
-8
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+2
-2
app/views/refs/blame.html.haml
app/views/refs/blame.html.haml
+2
-3
No files found.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
f69049c2
...
...
@@ -377,7 +377,6 @@ form {
min-height
:
20px
;
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.05
);
cursor
:pointer
;
&
.smoke
{
background-color
:
#f5f5f5
;
}
...
...
@@ -512,7 +511,8 @@ form {
.row_title
{
font-weight
:bold
;
color
:
#444
;
&
:hover
{
&
:hover
{
color
:
#444
;
text-decoration
:underline
;
}
}
...
...
app/assets/stylesheets/sections/issues.scss
View file @
f69049c2
...
...
@@ -34,7 +34,7 @@
width
:
32px
;
margin-top
:
4px
;
}
p
.row_title
{
.row_title
{
padding
:
0px
;
padding-bottom
:
2px
;
}
...
...
app/views/commits/_commit.html.haml
View file @
f69049c2
...
...
@@ -2,16 +2,15 @@
.browse_code_link_holder
%p
%strong
=
link_to
"Browse Code »"
,
tree_project_ref_path
(
@project
,
commit
.
id
),
:class
=>
"right"
=
link_to
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
do
%p
%code
.left
=
commit
.
short_id
%strong
.cgray
=
commit
.
author_name
–
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
16
%span
.row_title
=
truncate
(
commit
.
title
,
:length
=>
50
)
%p
%code
.left
=
link_to
commit
.
short_id
,
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
%strong
.cgray
=
commit
.
author_name
–
=
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"
%span
.committed_ago
=
time_ago_in_words
(
commit
.
committed_date
)
ago
%span
.committed_ago
=
time_ago_in_words
(
commit
.
committed_date
)
ago
app/views/events/_commit.html.haml
View file @
f69049c2
-
commit
=
CommitDecorator
.
decorate
(
commit
)
%li
.wll.commit
=
link_to
project_commit_path
(
project
,
:id
=>
commit
.
id
)
do
%p
%code
.left
=
commit
.
short_id
%strong
.cgray
=
commit
.
author_name
–
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
16
%span
.row_title
=
truncate
(
commit
.
title
,
:length
=>
50
)
rescue
"--broken encoding"
%p
%code
.left
=
link_to
commit
.
short_id
,
project_commit_path
(
project
,
:id
=>
commit
.
id
)
%strong
.cgray
=
commit
.
author_name
–
=
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"
rescue
"--broken encoding"
app/views/issues/_show.html.haml
View file @
f69049c2
...
...
@@ -24,8 +24,7 @@
-
else
=
image_tag
"no_avatar.png"
,
:class
=>
"avatar"
=
link_to
project_issue_path
(
issue
.
project
,
issue
)
do
%p
.row_title
=
truncate
(
issue
.
title
,
:length
=>
100
)
%p
=
link_to
truncate
(
issue
.
title
,
:length
=>
100
),
project_issue_path
(
issue
.
project
,
issue
),
:class
=>
"row_title"
%span
.update-author
%small
.cdark
=
"#
#{
issue
.
id
}
"
...
...
app/views/issues/show.html.haml
View file @
f69049c2
...
...
@@ -46,9 +46,7 @@
-
if
@issue
.
milestone
-
milestone
=
@issue
.
milestone
%cite
.cgray
and attached to milestone
=
link_to
project_milestone_path
(
milestone
.
project
,
milestone
)
do
%strong
=
truncate
(
milestone
.
title
,
:length
=>
20
)
%strong
=
link_to
truncate
(
milestone
.
title
,
:length
=>
20
),
project_milestone_path
(
milestone
.
project
,
milestone
)
.right
-
@issue
.
labels
.
each
do
|
label
|
...
...
app/views/merge_requests/_merge_request.html.haml
View file @
f69049c2
...
...
@@ -16,8 +16,7 @@
=
merge_request
.
target_branch
=
image_tag
gravatar_icon
(
merge_request
.
author_email
),
:class
=>
"avatar"
=
link_to
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
do
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
80
)
%p
=
link_to
truncate
(
merge_request
.
title
,
:length
=>
80
),
project_merge_request_path
(
merge_request
.
project
,
merge_request
),
:class
=>
"row_title"
%span
.update-author
%small
.cdark
=
"#
#{
merge_request
.
id
}
"
...
...
app/views/milestones/_milestone.html.haml
View file @
f69049c2
...
...
@@ -6,14 +6,13 @@
=
link_to
'Browse Issues'
,
project_issues_path
(
milestone
.
project
,
:milestone_id
=>
milestone
.
id
),
:class
=>
"btn small grouped"
-
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
project_milestone_path
(
milestone
.
project
,
milestone
)
do
%h4
.row_title
=
truncate
(
milestone
.
title
,
:length
=>
100
)
%small
=
milestone
.
expires_at
%br
.progress.progress-success.span3
.bar
{
:style
=>
"width: #{milestone.percent_complete}%;"
}
%h4
=
link_to
truncate
(
milestone
.
title
,
:length
=>
100
),
project_milestone_path
(
milestone
.
project
,
milestone
),
:class
=>
"row_title"
%small
=
milestone
.
expires_at
%br
.progress.progress-success.span3
.bar
{
:style
=>
"width: #{milestone.percent_complete}%;"
}
app/views/milestones/show.html.haml
View file @
f69049c2
...
...
@@ -50,8 +50,8 @@
%td
=
link_to
[
@project
,
issue
]
do
%span
.badge.badge-info
##{issue.id}
–
=
truncate
issue
.
title
,
:length
=>
60
–
=
link_to
truncate
(
issue
.
title
,
:length
=>
60
),
[
@project
,
issue
]
%br
=
paginate
@issues
,
:theme
=>
"gitlab"
...
...
app/views/refs/blame.html.haml
View file @
f69049c2
...
...
@@ -32,9 +32,8 @@
=
commit
.
author_name
%td
.blame_commit
=
link_to
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
do
%code
=
commit
.
short_id
%span
.row_title
=
truncate
(
commit
.
title
,
:length
=>
30
)
rescue
"--broken encoding"
%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"
%td
.lines
=
preserve
do
%pre
...
...
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