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
c3efcf7a
Commit
c3efcf7a
authored
Sep 25, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pollished push event
parent
c3907bef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
19 deletions
+23
-19
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+14
-6
app/views/events/_event_push.html.haml
app/views/events/_event_push.html.haml
+9
-13
No files found.
app/assets/stylesheets/sections/events.scss
View file @
c3efcf7a
...
...
@@ -50,7 +50,7 @@
}
.event-body
{
p
{
color
:
#
666
;
color
:
#
555
;
}
.event-info
{
color
:
#666
;
...
...
@@ -73,7 +73,8 @@
margin-left
:
50px
;
margin-bottom
:
5px
;
.avatar
{
width
:
22px
;
width
:
18px
;
margin-top
:
3px
;
}
}
...
...
@@ -84,10 +85,17 @@
.event_commits
{
margin-top
:
5px
;
li
.commit
{
li
{
&
.commit
{
background
:
transparent
;
padding
:
5
px
;
padding
:
3
px
;
border
:none
;
font-size
:
12px
;
}
&
.commits-stat
{
display
:
block
;
margin-top
:
5px
;
}
}
}
}
...
...
app/views/events/_event_push.html.haml
View file @
c3efcf7a
...
...
@@ -9,22 +9,18 @@
%strong
=
event
.
ref_name
at
%strong
=
link_to
event
.
project
.
name
,
event
.
project
-
if
event
.
push_with_commits?
-
if
event
.
commits_count
>
1
=
link_to
compare_project_commits_path
(
event
.
project
,
from:
event
.
parent_commit
.
id
,
to:
event
.
last_commit
.
id
)
do
%strong
#{
event
.
parent_commit
.
id
[
0
..
7
]
}
...
#{
event
.
last_commit
.
id
[
0
..
7
]
}
-
if
event
.
push_with_commits?
-
project
=
event
.
project
.event-body
%ul
.unstyled.event_commits
-
if
event
.
commits_count
>
3
-
event
.
commits
[
0
...
2
].
each
do
|
commit
|
=
render
"events/commit"
,
commit:
commit
,
project:
project
%li
%br
\... and
#{
event
.
commits_count
-
2
}
more commits
-
else
-
event
.
commits
.
each
do
|
commit
|
-
few_commits
=
event
.
commits
[
0
...
2
]
-
few_commits
.
each
do
|
commit
|
=
render
"events/commit"
,
commit:
commit
,
project:
project
%li
.commits-stat
-
if
event
.
commits_count
>
2
%span
... and
#{
event
.
commits_count
-
2
}
more commits.
=
link_to
compare_project_commits_path
(
event
.
project
,
from:
event
.
parent_commit
.
id
,
to:
event
.
last_commit
.
id
)
do
%strong
Compare
→
#{
event
.
parent_commit
.
id
[
0
..
7
]
}
...
#{
event
.
last_commit
.
id
[
0
..
7
]
}
.clearfix
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