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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c27b5782
Commit
c27b5782
authored
Mar 31, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix event rendering for certain event types
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
6985e7db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+8
-0
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+1
-1
No files found.
app/helpers/events_helper.rb
View file @
c27b5782
...
@@ -214,4 +214,12 @@ module EventsHelper
...
@@ -214,4 +214,12 @@ module EventsHelper
end
end
end
end
end
end
def
event_row_class
(
event
)
if
event
.
body?
||
event
.
created_project?
"event-block"
else
"event-inline"
end
end
end
end
app/views/events/_event.html.haml
View file @
c27b5782
-
if
event
.
visible_to_user?
(
current_user
)
-
if
event
.
visible_to_user?
(
current_user
)
.event-item
{
class:
"#{event.body? ? "
event
-
block
" : "
event
-
inline
" }"
}
.event-item
{
class:
event_row_class
(
event
)
}
.event-item-timestamp
.event-item-timestamp
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
...
...
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