Cache all events
This commit is contained in:
parent
fff36a8b89
commit
c015f96ba4
6 changed files with 32 additions and 14 deletions
|
@ -37,6 +37,7 @@ v 7.14.0 (unreleased)
|
|||
- Fetch code from forks to refs/merge-requests/:id/head when merge request created
|
||||
- Remove satellites
|
||||
- Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
|
||||
- Cache all events
|
||||
|
||||
v 7.13.2
|
||||
- Fix randomly failed spec
|
||||
|
|
|
@ -3,13 +3,11 @@
|
|||
.event-item-timestamp
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
|
||||
- if event.created_project?
|
||||
= 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
|
||||
= cache event, "v1" do
|
||||
= 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
|
||||
- elsif event.commented?
|
||||
= render "events/event/note", event: event
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
- else
|
||||
= event.project_name
|
||||
|
||||
- if current_user == event.author && !event.project.private? && twitter_sharing_enabled?
|
||||
.event-body
|
||||
- if !event.project.private? && twitter_sharing_enabled?
|
||||
.event-body{"data-user-is" => event.author_id}
|
||||
.event-note
|
||||
.md
|
||||
%p
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
- few_commits.each do |commit|
|
||||
= 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
|
||||
%li.commits-stat
|
||||
- if event.commits_count > 2
|
||||
|
@ -34,10 +34,11 @@
|
|||
Compare #{from_label}...#{truncate_sha(event.commit_to)}
|
||||
|
||||
- if create_mr
|
||||
or
|
||||
= link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do
|
||||
create a merge request
|
||||
%span{"data-user-is" => event.author_id}
|
||||
or
|
||||
= link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do
|
||||
create a merge request
|
||||
- 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
|
||||
Create Merge Request
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
= favicon_link_tag 'touch-icon-ipad-retina.png', rel: 'apple-touch-icon', sizes: '152x152'
|
||||
|
||||
-# 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'}
|
||||
|
||||
= yield :meta_tags
|
||||
|
@ -35,3 +35,5 @@
|
|||
= 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/bootlint' if Rails.env.development?
|
||||
|
||||
= render 'layouts/user_styles'
|
||||
|
|
16
app/views/layouts/_user_styles.html.haml
Normal file
16
app/views/layouts/_user_styles.html.haml
Normal file
|
@ -0,0 +1,16 @@
|
|||
: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;
|
||||
}
|
Loading…
Reference in a new issue