BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
25e629e4
Commit
25e629e4
authored
Aug 20, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Render small avatars for inline events
parent
9174020f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
events.scss
app/assets/stylesheets/sections/events.scss
+7
-0
event.rb
app/models/event.rb
+10
-0
_event.html.haml
app/views/events/_event.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/events.scss
View file @
25e629e4
...
...
@@ -35,6 +35,13 @@
padding-top
:
0
;
}
&
.event-inline
{
.avatar
{
width
:
16px
;
height
:
16px
;
}
}
padding
:
14px
0px
;
border-bottom
:
1px
solid
#eee
;
.event-title
{
...
...
app/models/event.rb
View file @
25e629e4
...
...
@@ -291,4 +291,14 @@ class Event < ActiveRecord::Base
"Wall"
end
.
downcase
end
def
body?
if
push?
push_with_commits?
elsif
note?
true
else
target
.
respond_to?
:title
end
end
end
app/views/events/_event.html.haml
View file @
25e629e4
-
if
event
.
proper?
%div
.event-item
.event-item
{
class:
"#{event.body? ? "
event
-
block
" : "
event
-
inline
" }"
}
%span
.cgray.pull-right
#{
time_ago_in_words
(
event
.
created_at
)
}
ago.
...
...
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