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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c015f96b
Commit
c015f96b
authored
Aug 06, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cache all events
parent
fff36a8b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
14 deletions
+32
-14
CHANGELOG
CHANGELOG
+1
-0
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+4
-6
app/views/events/event/_created_project.html.haml
app/views/events/event/_created_project.html.haml
+2
-2
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+6
-5
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+3
-1
app/views/layouts/_user_styles.html.haml
app/views/layouts/_user_styles.html.haml
+16
-0
No files found.
CHANGELOG
View file @
c015f96b
...
@@ -37,6 +37,7 @@ v 7.14.0 (unreleased)
...
@@ -37,6 +37,7 @@ v 7.14.0 (unreleased)
- Fetch code from forks to refs/merge-requests/:id/head when merge request created
- Fetch code from forks to refs/merge-requests/:id/head when merge request created
- Remove satellites
- Remove satellites
- Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
- Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
- Cache all events
v 7.13.2
v 7.13.2
- Fix randomly failed spec
- Fix randomly failed spec
...
...
app/views/events/_event.html.haml
View file @
c015f96b
...
@@ -3,13 +3,11 @@
...
@@ -3,13 +3,11 @@
.event-item-timestamp
.event-item-timestamp
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
-
if
event
.
created_project?
=
cache
event
,
"v1"
do
=
cache
[
event
,
current_user
]
do
=
image_tag
avatar_icon
(
event
.
author_email
,
24
),
class:
"avatar s24"
,
alt
:''
=
render
"events/event/created_project"
,
event:
event
-
else
=
image_tag
avatar_icon
(
event
.
author_email
,
24
),
class:
"avatar s24"
,
alt
:''
=
image_tag
avatar_icon
(
event
.
author_email
,
24
),
class:
"avatar s24"
,
alt
:''
-
if
event
.
push?
-
if
event
.
created_project?
=
render
"events/event/created_project"
,
event:
event
-
elsif
event
.
push?
=
render
"events/event/push"
,
event:
event
=
render
"events/event/push"
,
event:
event
-
elsif
event
.
commented?
-
elsif
event
.
commented?
=
render
"events/event/note"
,
event:
event
=
render
"events/event/note"
,
event:
event
...
...
app/views/events/event/_created_project.html.haml
View file @
c015f96b
...
@@ -8,8 +8,8 @@
...
@@ -8,8 +8,8 @@
-
else
-
else
=
event
.
project_name
=
event
.
project_name
-
if
current_user
==
event
.
author
&&
!
event
.
project
.
private?
&&
twitter_sharing_enabled?
-
if
!
event
.
project
.
private?
&&
twitter_sharing_enabled?
.event-body
.event-body
{
"data-user-is"
=>
event
.
author_id
}
.event-note
.event-note
.md
.md
%p
%p
...
...
app/views/events/event/_push.html.haml
View file @
c015f96b
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
-
few_commits
.
each
do
|
commit
|
-
few_commits
.
each
do
|
commit
|
=
render
"events/commit"
,
commit:
commit
,
project:
project
=
render
"events/commit"
,
commit:
commit
,
project:
project
-
create_mr
=
current_user
==
event
.
author
&&
event
.
new_ref?
&&
create_mr_button?
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
-
create_mr
=
event
.
new_ref?
&&
create_mr_button?
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
-
if
event
.
commits_count
>
1
-
if
event
.
commits_count
>
1
%li
.commits-stat
%li
.commits-stat
-
if
event
.
commits_count
>
2
-
if
event
.
commits_count
>
2
...
@@ -34,10 +34,11 @@
...
@@ -34,10 +34,11 @@
Compare
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
Compare
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
-
if
create_mr
-
if
create_mr
or
%span
{
"data-user-is"
=>
event
.
author_id
}
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
or
create a merge request
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
create a merge request
-
elsif
create_mr
-
elsif
create_mr
%li
.commits-stat
%li
.commits-stat
{
"data-user-is"
=>
event
.
author_id
}
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
Create Merge Request
Create Merge Request
app/views/layouts/_head.html.haml
View file @
c015f96b
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
=
favicon_link_tag
'touch-icon-ipad-retina.png'
,
rel:
'apple-touch-icon'
,
sizes:
'152x152'
=
favicon_link_tag
'touch-icon-ipad-retina.png'
,
rel:
'apple-touch-icon'
,
sizes:
'152x152'
-# Windows 8 pinned site tile
-# Windows 8 pinned site tile
%meta
{
name:
'msapplication-TileImage'
,
content:
image_
url
(
'msapplication-tile.png'
)}
%meta
{
name:
'msapplication-TileImage'
,
content:
image_
path
(
'msapplication-tile.png'
)}
%meta
{
name:
'msapplication-TileColor'
,
content:
'#30353E'
}
%meta
{
name:
'msapplication-TileColor'
,
content:
'#30353E'
}
=
yield
:meta_tags
=
yield
:meta_tags
...
@@ -35,3 +35,5 @@
...
@@ -35,3 +35,5 @@
=
render
'layouts/google_analytics'
if
extra_config
.
has_key?
(
'google_analytics_id'
)
=
render
'layouts/google_analytics'
if
extra_config
.
has_key?
(
'google_analytics_id'
)
=
render
'layouts/piwik'
if
extra_config
.
has_key?
(
'piwik_url'
)
&&
extra_config
.
has_key?
(
'piwik_site_id'
)
=
render
'layouts/piwik'
if
extra_config
.
has_key?
(
'piwik_url'
)
&&
extra_config
.
has_key?
(
'piwik_site_id'
)
=
render
'layouts/bootlint'
if
Rails
.
env
.
development?
=
render
'layouts/bootlint'
if
Rails
.
env
.
development?
=
render
'layouts/user_styles'
app/views/layouts/_user_styles.html.haml
0 → 100644
View file @
c015f96b
:css
[
data-user-is
]
{
display
:
none
!important
;
}
[
data-user-is
=
"
#{
current_user
.
try
(
:id
)
}
"
]
{
display
:
block
!important
;
}
[
data-user-is-not
]
{
display
:
block
!important
;
}
[
data-user-is-not
=
"
#{
current_user
.
try
(
:id
)
}
"
]
{
display
:
none
!important
;
}
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