Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
25e629e4
Commit
25e629e4
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Download
Email Patches
Plain Diff
Render small avatars for inline events
parent
9174020f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+7
-0
app/models/event.rb
app/models/event.rb
+10
-0
app/views/events/_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
{
...
...
This diff is collapsed.
Click to expand it.
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
This diff is collapsed.
Click to expand it.
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.
...
...
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