From 1cbcb09d67c19403bc0cadf945d59dca3ab0ac37 Mon Sep 17 00:00:00 2001 From: ThibG Date: Tue, 30 Oct 2018 00:47:31 +0100 Subject: [PATCH 1/9] Do not hide boost notifications from followed people with hidden boosts (#9147) * Do not hide boost notifications from followed people with hidden boosts Not displaying boosts from a followed user in the Home timeline and not having notifications when they reblog your own content are two very separate concerns, tying them together seem counter-intuitive and unwanted. * Update specs accordingly --- app/services/notify_service.rb | 2 +- spec/services/notify_service_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index 49022a844e..a8b7bb30ba 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -31,7 +31,7 @@ class NotifyService < BaseService end def blocked_reblog? - @recipient.muting_reblogs?(@notification.from_account) + false end def blocked_follow_request? diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb index d346679431..39a681abbf 100644 --- a/spec/services/notify_service_spec.rb +++ b/spec/services/notify_service_spec.rb @@ -104,9 +104,9 @@ RSpec.describe NotifyService, type: :service do is_expected.to change(Notification, :count) end - it 'hides reblogs when disabled' do - recipient.follow!(sender, reblogs: false) - is_expected.to_not change(Notification, :count) + it 'shows reblogs when disabled' do + recipient.follow!(sender, reblogs: true) + is_expected.to change(Notification, :count) end end From 4e034437e3da57bd4d2e0229a3af5bea2a422b2b Mon Sep 17 00:00:00 2001 From: Masoud Abkenar Date: Tue, 30 Oct 2018 00:47:43 +0100 Subject: [PATCH 2/9] RTL: fix preferences page checkbox margins (#9145) * RTL: fix preferences page checkbox margins * Update rtl.scss --- app/javascript/styles/mastodon/rtl.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss index 176fb5ce0f..e5621c519e 100644 --- a/app/javascript/styles/mastodon/rtl.scss +++ b/app/javascript/styles/mastodon/rtl.scss @@ -199,12 +199,16 @@ body.rtl { margin-left: 5px; } - .simple_form .check_boxes .checkbox label, - .simple_form .input.with_label.boolean label.checkbox { + .simple_form .check_boxes .checkbox label { padding-left: 0; padding-right: 25px; } + .simple_form .input.with_label.boolean label.checkbox { + padding-left: 25px; + padding-right: 0; + } + .simple_form .check_boxes .checkbox input[type="checkbox"], .simple_form .input.boolean input[type="checkbox"] { left: auto; From 27b5a57f6df0baafa13275035c0ab1a15684fb4f Mon Sep 17 00:00:00 2001 From: Masoud Abkenar Date: Tue, 30 Oct 2018 00:49:29 +0100 Subject: [PATCH 3/9] RTL: fix toot privacy preferences radio buttonss (#9146) --- app/javascript/styles/mastodon/rtl.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss index e5621c519e..940dc8af29 100644 --- a/app/javascript/styles/mastodon/rtl.scss +++ b/app/javascript/styles/mastodon/rtl.scss @@ -374,4 +374,9 @@ body.rtl { padding-left: 0; padding-right: 10px; } + + .simple_form .input.radio_buttons .radio > label input { + left: auto; + right: 0; + } } From bd7997735418bdcb3a390a168c8076e4d816cbd8 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 30 Oct 2018 01:06:47 +0100 Subject: [PATCH 4/9] Bump i18n-tasks from master to 0.9.28 (#9148) --- Gemfile | 2 +- Gemfile.lock | 33 +++++++++++++-------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index 3ffb0140f8..1f9733530f 100644 --- a/Gemfile +++ b/Gemfile @@ -95,7 +95,7 @@ gem 'rdf-normalize', '~> 0.3' group :development, :test do gem 'fabrication', '~> 2.20' gem 'fuubar', '~> 2.3' - gem 'i18n-tasks', '~> 0.9', require: false, git: 'https://github.com/glebm/i18n-tasks.git', branch: 'master', ref: 'a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f' + gem 'i18n-tasks', '~> 0.9', require: false gem 'pry-byebug', '~> 3.6' gem 'pry-rails', '~> 0.3' gem 'rspec-rails', '~> 3.8' diff --git a/Gemfile.lock b/Gemfile.lock index b0efd1bfb9..aedfe6de8a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,3 @@ -GIT - remote: https://github.com/glebm/i18n-tasks.git - revision: a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f - ref: a1c9089b4ffed4f33e3b3a1bb2378d7a23445c0f - branch: master - specs: - i18n-tasks (0.9.27) - activesupport (>= 4.0.2) - ast (>= 2.1.0) - erubi - highline (>= 2.0.0) - i18n - parser (>= 2.2.3.0) - rails-i18n - rainbow (>= 2.2.2, < 4.0) - terminal-table (>= 1.5.1) - GIT remote: https://github.com/rtomayko/posix-spawn revision: 58465d2e213991f8afb13b984854a49fcdcc980c @@ -289,6 +272,16 @@ GEM rainbow (>= 2.0.0) i18n (1.1.1) concurrent-ruby (~> 1.0) + i18n-tasks (0.9.28) + activesupport (>= 4.0.2) + ast (>= 2.1.0) + erubi + highline (>= 2.0.0) + i18n + parser (>= 2.2.3.0) + rails-i18n + rainbow (>= 2.2.2, < 4.0) + terminal-table (>= 1.5.1) idn-ruby (0.1.0) ipaddress (0.8.3) iso-639 (0.2.8) @@ -396,7 +389,7 @@ GEM parallel (1.12.1) parallel_tests (2.26.0) parallel - parser (2.5.1.2) + parser (2.5.3.0) ast (~> 2.4.0) pastel (0.7.2) equatable (~> 0.5.0) @@ -459,7 +452,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.1) + rails-i18n (5.1.2) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) rails-settings-cached (0.6.6) @@ -699,7 +692,7 @@ DEPENDENCIES http_accept_language (~> 2.1) http_parser.rb (~> 0.6)! httplog (~> 1.1) - i18n-tasks (~> 0.9)! + i18n-tasks (~> 0.9) idn-ruby iso-639 json-ld (~> 2.2) From fcd79aba0b2d3320c22a3bb7620442aa65616677 Mon Sep 17 00:00:00 2001 From: trwnh Date: Tue, 30 Oct 2018 00:33:02 -0500 Subject: [PATCH 5/9] Make detailed-status__wrapper actually wrap detailed status (#8547) * Remove class from scrollable div .detailed-status__wrapper does not actually wrap the detailed status here * Re-add class to focusable div .detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area --- app/javascript/mastodon/features/status/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js index b36d828650..a092f7bb14 100644 --- a/app/javascript/mastodon/features/status/index.js +++ b/app/javascript/mastodon/features/status/index.js @@ -428,11 +428,11 @@ class Status extends ImmutablePureComponent { /> -
+
{ancestors} -
+
Date: Tue, 30 Oct 2018 06:39:52 +0100 Subject: [PATCH 6/9] Bump oj from 3.6.12 to 3.7.0 (#9155) Bumps [oj](https://github.com/ohler55/oj) from 3.6.12 to 3.7.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.6.12...v3.7.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1f9733530f..bf23015e63 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem 'link_header', '~> 0.0' gem 'mime-types', '~> 3.2', require: 'mime/types/columnar' gem 'nokogiri', '~> 1.8' gem 'nsa', '~> 0.2' -gem 'oj', '~> 3.6' +gem 'oj', '~> 3.7' gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.10' gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c' diff --git a/Gemfile.lock b/Gemfile.lock index aedfe6de8a..82b5f92248 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -360,7 +360,7 @@ GEM concurrent-ruby (~> 1.0.0) sidekiq (>= 3.5.0) statsd-ruby (~> 1.2.0) - oj (3.6.12) + oj (3.7.0) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) @@ -709,7 +709,7 @@ DEPENDENCIES net-ldap (~> 0.10) nokogiri (~> 1.8) nsa (~> 0.2) - oj (~> 3.6) + oj (~> 3.7) omniauth (~> 1.2) omniauth-cas (~> 1.1) omniauth-saml (~> 1.10) From cecd8b25c4bee503bb9c6ba7668beb1b374d4460 Mon Sep 17 00:00:00 2001 From: Masoud Abkenar Date: Tue, 30 Oct 2018 00:47:43 +0100 Subject: [PATCH 7/9] [Glitch] RTL: fix preferences page checkbox margins Port 4e034437e3da57bd4d2e0229a3af5bea2a422b2b to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index d4618440d8..c0079a2865 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -210,12 +210,16 @@ body.rtl { margin-left: 5px; } - .simple_form .check_boxes .checkbox label, - .simple_form .input.with_label.boolean label.checkbox { + .simple_form .check_boxes .checkbox label { padding-left: 0; padding-right: 25px; } + .simple_form .input.with_label.boolean label.checkbox { + padding-left: 25px; + padding-right: 0; + } + .simple_form .check_boxes .checkbox input[type="checkbox"], .simple_form .input.boolean input[type="checkbox"] { left: auto; From bdcdc35df7ce1d6e97745573492cc5845dcece27 Mon Sep 17 00:00:00 2001 From: Masoud Abkenar Date: Tue, 30 Oct 2018 00:49:29 +0100 Subject: [PATCH 8/9] [Glitch] RTL: fix toot privacy preferences radio buttonss Port 27b5a57f6df0baafa13275035c0ab1a15684fb4f to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index c0079a2865..9e0a93ec23 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -385,4 +385,9 @@ body.rtl { padding-left: 0; padding-right: 10px; } + + .simple_form .input.radio_buttons .radio > label input { + left: auto; + right: 0; + } } From d0049947871d17cec449b8b1d450393fed6696da Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 30 Oct 2018 12:46:05 +0100 Subject: [PATCH 9/9] Remove duplicate and outdated specs --- spec/services/notify_service_spec.rb | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb index 30214030ee..7bfca7fb5e 100644 --- a/spec/services/notify_service_spec.rb +++ b/spec/services/notify_service_spec.rb @@ -47,26 +47,6 @@ RSpec.describe NotifyService, type: :service do recipient.update(suspended: true) is_expected.to_not change(Notification, :count) end - - describe 'reblogs' do - let(:status) { Fabricate(:status, account: Fabricate(:account)) } - let(:activity) { Fabricate(:status, account: sender, reblog: status) } - - it 'shows reblogs by default' do - recipient.follow!(sender) - is_expected.to change(Notification, :count) - end - - it 'shows reblogs when explicitly enabled' do - recipient.follow!(sender, reblogs: true) - is_expected.to change(Notification, :count) - end - - it 'hides reblogs when disabled' do - recipient.follow!(sender, reblogs: false) - is_expected.to_not change(Notification, :count) - end - end context 'for direct messages' do let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }