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
63345756
Commit
63345756
authored
Mar 31, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Differentiate between event types
parent
b90f83e9
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
14 deletions
+23
-14
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+6
-1
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+0
-3
app/views/events/event/_common.html.haml
app/views/events/event/_common.html.haml
+8
-6
app/views/events/event/_created_project.html.haml
app/views/events/event/_created_project.html.haml
+3
-1
app/views/events/event/_note.html.haml
app/views/events/event/_note.html.haml
+3
-1
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+3
-2
No files found.
app/assets/stylesheets/pages/events.scss
View file @
63345756
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
*/
*/
.event-item
{
.event-item
{
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
padding
:
$gl-padding
;
padding
:
$gl-padding
0
;
border-bottom
:
1px
solid
$white-normal
;
border-bottom
:
1px
solid
$white-normal
;
color
:
$list-text-color
;
color
:
$list-text-color
;
...
@@ -25,6 +25,11 @@
...
@@ -25,6 +25,11 @@
color
:
$list-text-color
;
color
:
$list-text-color
;
}
}
.event-icon
{
display
:
inline-block
;
margin
:
0
10px
;
}
svg
{
svg
{
height
:
16px
;
height
:
16px
;
width
:
16px
;
width
:
16px
;
...
...
app/views/events/_event.html.haml
View file @
63345756
...
@@ -4,13 +4,10 @@
...
@@ -4,13 +4,10 @@
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
-
if
event
.
created_project?
-
if
event
.
created_project?
=
custom_icon
(
"icon_status_open"
)
=
render
"events/event/created_project"
,
event:
event
=
render
"events/event/created_project"
,
event:
event
-
elsif
event
.
push?
-
elsif
event
.
push?
=
custom_icon
(
"icon_commit"
)
=
render
"events/event/push"
,
event:
event
=
render
"events/event/push"
,
event:
event
-
elsif
event
.
commented?
-
elsif
event
.
commented?
=
custom_icon
(
"comment_o"
)
=
render
"events/event/note"
,
event:
event
=
render
"events/event/note"
,
event:
event
-
else
-
else
=
render
"events/event/common"
,
event:
event
=
render
"events/event/common"
,
event:
event
app/views/events/event/_common.html.haml
View file @
63345756
-
if
event
.
target
-
if
event
.
target
-
if
event
.
target_type
==
"MergeRequest"
-
if
event
.
action_name
==
"opened"
-
if
event
.
action_name
==
"opened"
.event-icon.open-icon
=
custom_icon
(
"icon_status_open"
)
=
custom_icon
(
"icon_status_open"
)
-
elsif
event
.
action_name
==
"closed"
-
elsif
event
.
action_name
==
"closed"
.event-icon.closed-icon
=
custom_icon
(
"icon_status_closed"
)
=
custom_icon
(
"icon_status_closed"
)
-
else
-
else
.event-icon.fork-icon
=
custom_icon
(
"code_fork"
)
=
custom_icon
(
"code_fork"
)
.event-title
.event-title
...
...
app/views/events/event/_created_project.html.haml
View file @
63345756
.event-icon.open-icon
=
custom_icon
(
"icon_status_open"
)
.event-title
.event-title
%span
.author_name
=
link_to_author
event
%span
{
class:
event
.
action_name
}
%span
{
class:
event
.
action_name
}
=
event_action_name
(
event
)
=
event_action_name
(
event
)
...
...
app/views/events/event/_note.html.haml
View file @
63345756
.event-icon
=
custom_icon
(
"comment_o"
)
.event-title
.event-title
%span
.author_name
=
link_to_author
event
=
event
.
action_name
=
event
.
action_name
=
event_note_title_html
(
event
)
=
event_note_title_html
(
event
)
...
...
app/views/events/event/_push.html.haml
View file @
63345756
-
project
=
event
.
project
-
project
=
event
.
project
.event-icon
=
custom_icon
(
"icon_commit"
)
.event-title
.event-title
%span
.author_name
=
link_to_author
event
%span
.pushed
#{
event
.
action_name
}
#{
event
.
ref_type
}
%span
.pushed
#{
event
.
action_name
}
#{
event
.
ref_type
}
%strong
%strong
-
commits_link
=
namespace_project_commits_path
(
project
.
namespace
,
project
,
event
.
ref_name
)
-
commits_link
=
namespace_project_commits_path
(
project
.
namespace
,
project
,
event
.
ref_name
)
...
@@ -48,4 +50,3 @@
...
@@ -48,4 +50,3 @@
.event-body
.event-body
%ul
.well-list.event_commits
%ul
.well-list.event_commits
=
render
"events/commit"
,
commit:
last_commit
,
project:
project
,
event:
event
=
render
"events/commit"
,
commit:
last_commit
,
project:
project
,
event:
event
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