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
b57faf92
Commit
b57faf92
authored
12 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Push events polished
parent
cadf12c6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
9 deletions
+21
-9
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+1
-3
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+9
-0
app/views/events/_event_changed_merge_request.html.haml
app/views/events/_event_changed_merge_request.html.haml
+1
-0
app/views/events/_event_new_merge_request.html.haml
app/views/events/_event_new_merge_request.html.haml
+1
-0
app/views/events/_event_push.html.haml
app/views/events/_event_push.html.haml
+9
-6
No files found.
app/assets/stylesheets/common.scss
View file @
b57faf92
...
...
@@ -871,7 +871,7 @@ p.time {
.event_feed
{
min-height
:
40px
;
border-bottom
:
1px
solid
#
eee
;
border-bottom
:
1px
solid
#
ddd
;
.avatar
{
width
:
32px
;
}
...
...
@@ -884,8 +884,6 @@ p.time {
}
padding
:
15px
5px
;
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.05
);
&
:last-child
{
border
:none
}
.wll
:hover
{
background
:none
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/events/_commit.html.haml
0 → 100644
View file @
b57faf92
%li
.wll.commit
=
link_to
project_commit_path
(
project
,
:id
=>
commit
.
id
)
do
%p
%code
.left
=
commit
.
id
.
to_s
[
0
..
10
]
%strong
.cgray
=
commit
.
author_name
–
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
16
%span
.row_title
=
truncate
(
commit
.
safe_message
,
:length
=>
50
)
rescue
"--broken encoding"
This diff is collapsed.
Click to expand it.
app/views/events/_event_changed_merge_request.html.haml
View file @
b57faf92
...
...
@@ -13,6 +13,7 @@ at
%span
.cgray
=
time_ago_in_words
(
event
.
created_at
)
ago.
%br
%span
.label
=
event
.
merge_request
.
source_branch
→
%span
.label
=
event
.
merge_request
.
target_branch
...
...
This diff is collapsed.
Click to expand it.
app/views/events/_event_new_merge_request.html.haml
View file @
b57faf92
...
...
@@ -9,6 +9,7 @@ at
%span
.cgray
=
time_ago_in_words
(
event
.
created_at
)
ago.
%br
%span
.label
=
event
.
merge_request
.
source_branch
→
%span
.label
=
event
.
merge_request
.
target_branch
...
...
This diff is collapsed.
Click to expand it.
app/views/events/_event_push.html.haml
View file @
b57faf92
...
...
@@ -30,13 +30,16 @@
ago.
-
if
event
.
commits
.
count
>
1
=
link_to
compare_project_commits_path
(
event
.
project
,
:from
=>
event
.
commits
.
first
.
prev_commit_id
,
:to
=>
event
.
commits
.
last
.
id
)
do
Compare
#{
event
.
commits
.
first
.
commit
.
id
[
0
..
8
]
}
...
#{
event
.
commits
.
last
.
id
[
0
..
8
]
}
-
@
project
=
event
.
project
%strong
#{
event
.
commits
.
first
.
commit
.
id
[
0
..
7
]
}
...
#{
event
.
commits
.
last
.
id
[
0
..
7
]
}
-
project
=
event
.
project
%ul
.unstyled.event_commits
-
if
event
.
commits
.
size
>
3
=
render
event
.
commits
[
0
...
2
]
%li
... and
#{
event
.
commits
.
size
-
2
}
more commits
-
event
.
commits
[
0
...
2
].
each
do
|
commit
|
=
render
"events/commit"
,
:commit
=>
commit
,
:project
=>
project
%li
%br
\... and
#{
event
.
commits
.
size
-
2
}
more commits
-
else
=
render
event
.
commits
-
event
.
commits
.
each
do
|
commit
|
=
render
"events/commit"
,
:commit
=>
commit
,
:project
=>
project
This diff is collapsed.
Click to expand it.
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