From c015f96ba44e80df5d89c6311c7804b439425280 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 6 Aug 2015 13:15:33 +0200 Subject: Cache all events --- CHANGELOG | 1 + app/views/events/_event.html.haml | 10 ++++------ app/views/events/event/_created_project.html.haml | 4 ++-- app/views/events/event/_push.html.haml | 11 ++++++----- app/views/layouts/_head.html.haml | 4 +++- app/views/layouts/_user_styles.html.haml | 16 ++++++++++++++++ 6 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 app/views/layouts/_user_styles.html.haml diff --git a/CHANGELOG b/CHANGELOG index 439534c37d9..4473f0637fd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 5ab5ffc238c..0377760a9b8 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -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 diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml index c2577a24982..8cf36c711b4 100644 --- a/app/views/events/event/_created_project.html.haml +++ b/app/views/events/event/_created_project.html.haml @@ -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 diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 34a7c00dc43..4de3e66962b 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -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 diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 54cddc30b74..397649dacf8 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -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' diff --git a/app/views/layouts/_user_styles.html.haml b/app/views/layouts/_user_styles.html.haml new file mode 100644 index 00000000000..b7f0f316724 --- /dev/null +++ b/app/views/layouts/_user_styles.html.haml @@ -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; + } -- cgit v1.2.1 From 9bd074d4cf6b81328921c03c93a385b703da71c9 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 6 Aug 2015 14:55:03 +0200 Subject: Use display: inline where appropriate --- app/views/events/event/_push.html.haml | 2 +- app/views/layouts/_user_styles.html.haml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 4de3e66962b..8bed5cdb9cc 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -34,7 +34,7 @@ Compare #{from_label}...#{truncate_sha(event.commit_to)} - if create_mr - %span{"data-user-is" => event.author_id} + %span{"data-user-is" => event.author_id, "data-display" => "inline"} or = link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do create a merge request diff --git a/app/views/layouts/_user_styles.html.haml b/app/views/layouts/_user_styles.html.haml index b7f0f316724..b76b3cb5510 100644 --- a/app/views/layouts/_user_styles.html.haml +++ b/app/views/layouts/_user_styles.html.haml @@ -7,10 +7,18 @@ display: block !important; } + [data-user-is="#{current_user.try(:id)}"][data-display="inline"] { + display: inline !important; + } + [data-user-is-not] { display: block !important; } + [data-user-is-not][data-display="inline"] { + display: inline !important; + } + [data-user-is-not="#{current_user.try(:id)}"] { display: none !important; } -- cgit v1.2.1 From 71158b11f2bba72c464a8307a19670fc71525682 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 7 Aug 2015 18:00:55 +0200 Subject: Add more spacing between MR widget and tabs Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/pages/merge_requests.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 9af8227a52f..bb61a51029b 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -91,8 +91,6 @@ @media(min-width: $screen-sm-max) { .merge-request .merge-request-tabs{ - margin: 20px 0; - li { a { padding: 15px 40px; @@ -102,6 +100,11 @@ } } +.merge-request .merge-request-tabs{ + margin-top: 30px; + margin-bottom: 20px; +} + .mr_source_commit, .mr_target_commit { .commit { -- cgit v1.2.1 From 1c3c232608538a2a7bb0b6b400343cad6de4a8fb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 7 Aug 2015 18:12:15 +0200 Subject: Revert "Put author name at the end of a tree row" This reverts commit ee0fc2c3ad9608db91175e082fe1f6da19a3aec7. --- app/assets/stylesheets/pages/tree.scss | 6 +++++- app/views/projects/tree/_tree_commit_column.html.haml | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 642bcd943aa..34ee4d7b31e 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -60,7 +60,11 @@ } .tree_author { - padding-left: 8px; + padding-right: 8px; + + .commit-author-name { + color: gray; + } } .tree_commit { diff --git a/app/views/projects/tree/_tree_commit_column.html.haml b/app/views/projects/tree/_tree_commit_column.html.haml index 86a80703072..50521264a61 100644 --- a/app/views/projects/tree/_tree_commit_column.html.haml +++ b/app/views/projects/tree/_tree_commit_column.html.haml @@ -1,6 +1,3 @@ %span.str-truncated + %span.tree_author= commit_author_link(commit, avatar: true, size: 16) = link_to_gfm commit.title, namespace_project_commit_path(@project.namespace, @project, commit.id), class: "tree-commit-link" - %span.tree_author - [ - commit_author_link(commit, avatar: false) - ] -- cgit v1.2.1 From 6783437ce5e9c1a2a7d680b42986311d79cc204c Mon Sep 17 00:00:00 2001 From: Stefan Tatschner Date: Sat, 8 Aug 2015 19:46:34 +0200 Subject: Improve abuse report wording --- app/views/abuse_reports/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml index a3b34345a3c..cffd7684008 100644 --- a/app/views/abuse_reports/new.html.haml +++ b/app/views/abuse_reports/new.html.haml @@ -1,6 +1,6 @@ - page_title "Report abuse" %h3.page-title Report abuse -%p Please use this form to report users who create spam issues or comments or who otherwise behave inappropriately. +%p Please use this form to report users who create spam issues, comments or behave inappropriately. %hr = form_for @abuse_report, html: { class: 'form-horizontal'} do |f| = f.hidden_field :user_id -- cgit v1.2.1 From 3f045b25d7e290953fb668100928b882e00fb7bd Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 8 Aug 2015 22:02:40 -0400 Subject: Fix transparency for msapplication-tile image [ci skip] --- app/assets/images/msapplication-tile.png | Bin 6102 -> 5798 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/assets/images/msapplication-tile.png b/app/assets/images/msapplication-tile.png index f8c5c8b28b4..58bbf2b20cb 100644 Binary files a/app/assets/images/msapplication-tile.png and b/app/assets/images/msapplication-tile.png differ -- cgit v1.2.1