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
375ebcab
Commit
375ebcab
authored
Mar 01, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improved activity ui
parent
c94159ab
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
30 deletions
+38
-30
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+2
-0
app/models/event.rb
app/models/event.rb
+5
-0
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+31
-30
No files found.
app/assets/stylesheets/common.scss
View file @
375ebcab
...
@@ -616,6 +616,7 @@ p.time {
...
@@ -616,6 +616,7 @@ p.time {
.wll
{
.wll
{
padding
:
5px
;
padding
:
5px
;
margin-top
:
5px
;
border
:none
;
border
:none
;
&
:hover
{
&
:hover
{
background
:none
;
background
:none
;
...
@@ -632,6 +633,7 @@ p.time {
...
@@ -632,6 +633,7 @@ p.time {
}
}
ul
{
ul
{
margin-left
:
50px
;
margin-left
:
50px
;
margin-bottom
:
5px
;
.avatar
{
.avatar
{
width
:
24px
;
width
:
24px
;
}
}
...
...
app/models/event.rb
View file @
375ebcab
...
@@ -21,6 +21,11 @@ class Event < ActiveRecord::Base
...
@@ -21,6 +21,11 @@ class Event < ActiveRecord::Base
end
end
end
end
# For now only push events enabled for system
def
allowed?
push?
end
def
push?
def
push?
action
==
self
.
class
::
Pushed
action
==
self
.
class
::
Pushed
end
end
...
...
app/views/events/_event.html.haml
View file @
375ebcab
.wll.event_feed
-
if
event
.
allowed?
.wll.event_feed
-
if
event
.
push?
-
if
event
.
push?
-
if
event
.
new_branch?
-
if
event
.
new_branch?
=
image_tag
gravatar_icon
(
event
.
pusher_email
),
:class
=>
"avatar"
=
image_tag
gravatar_icon
(
event
.
pusher_email
),
:class
=>
"avatar"
...
...
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