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
2e2e0522
Commit
2e2e0522
authored
Mar 15, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
a4993f16
945702a3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+9
-0
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+2
-2
app/views/merge_requests/show.html.haml
app/views/merge_requests/show.html.haml
+2
-2
No files found.
app/assets/stylesheets/common.scss
View file @
2e2e0522
...
@@ -926,3 +926,12 @@ p.time {
...
@@ -926,3 +926,12 @@ p.time {
font-style
:
italic
;
font-style
:
italic
;
color
:
#999
;
color
:
#999
;
}
}
.upvotes
{
font-size
:
14px
;
font-weight
:
bold
;
color
:
#468847
;
text-align
:
right
;
padding
:
4px
;
margin
:
2px
;
}
app/views/issues/show.html.haml
View file @
2e2e0522
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
=
link_to
edit_project_issue_path
(
@project
,
@issue
),
:class
=>
"btn"
do
=
link_to
edit_project_issue_path
(
@project
,
@issue
),
:class
=>
"btn"
do
Edit
Edit
%br
-
if
@issue
.
upvotes
>
0
-
if
@issue
.
upvotes
>
0
=
link_to
"#notes"
,
:class
=>
"btn success"
do
.upvotes
#upvotes
=
"+
#{
pluralize
@issue
.
upvotes
,
'upvote'
}
"
+
#{
@issue
.
upvotes
}
.back_link
.back_link
...
...
app/views/merge_requests/show.html.haml
View file @
2e2e0522
...
@@ -16,9 +16,9 @@
...
@@ -16,9 +16,9 @@
=
link_to
edit_project_merge_request_path
(
@project
,
@merge_request
),
:class
=>
"btn"
do
=
link_to
edit_project_merge_request_path
(
@project
,
@merge_request
),
:class
=>
"btn"
do
Edit
Edit
%br
-
if
@merge_request
.
upvotes
>
0
-
if
@merge_request
.
upvotes
>
0
=
link_to
"#notes"
,
:class
=>
"btn success"
do
.upvotes
#upvotes
=
"+
#{
pluralize
@merge_request
.
upvotes
,
'upvote'
}
"
+
#{
@merge_request
.
upvotes
}
.back_link
.back_link
=
link_to
project_merge_requests_path
(
@project
)
do
=
link_to
project_merge_requests_path
(
@project
)
do
...
...
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