From 370ffc44ae37329248b5a5acbf38c098a4dd4414 Mon Sep 17 00:00:00 2001 From: Mashiro Date: Thu, 12 Jan 2023 15:08:25 +0800 Subject: [PATCH 1/4] perf: remove version suffix until elk support it --- lib/mastodon/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 765eef8a861f5e..9ac2751ab1522e 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ def flags end def suffix - '~hello' + '' end def to_a From f5f724cd235b1e7023c54da127c15405c2b97e0b Mon Sep 17 00:00:00 2001 From: mashirozx Date: Tue, 21 Feb 2023 09:50:00 +0800 Subject: [PATCH 2/4] perf: allow unsafe-inline in CSP --- config/initializers/content_security_policy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 33d971c341a42a..24dd3b3be79a62 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -26,7 +26,7 @@ def host_to_url(str) p.frame_ancestors :none p.font_src :self, assets_host, google_fonts_host, iconfont_host p.img_src :self, :https, :data, :blob, assets_host, analytics_host - p.style_src :self, assets_host, google_fonts_host, iconfont_host + p.style_src :self, :unsafe_inline, assets_host, google_fonts_host, iconfont_host p.media_src :self, :https, :data, assets_host p.frame_src :self, :https p.manifest_src :self, assets_host From bc2f5ff427ca1ace8c7e44a534f83e3714803e1c Mon Sep 17 00:00:00 2001 From: mashirozx Date: Tue, 21 Feb 2023 10:01:11 +0800 Subject: [PATCH 3/4] docs: update readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 677a969c65f193..2b6f25345af221 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,10 @@ The Docker images are listed [here](https://hub.docker.com/r/mashirozx/mastodon/ +## Some Notes and Further Plan + +Since there are a lot of changes in v4 of upstream, I'm still working on merging it, see `dev` branch. But for the benefit of a long turn maintenance, I'm planing remove some less important features form this fork to reduce the work I have to do every time when merge the code. I'm also considering switching to another web front end, like [elk](https://elk.zone), because the official web interface is really not in my favour :( + ## Finally Thanks for the support of [JetBrains](https://jb.gg/OpenSourceSupport). From 314d383395fcfe5ecff3e1c61f462f6ea2cd8213 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 22:17:40 +0000 Subject: [PATCH 4/4] build(deps): bump ruby-progressbar from 1.11.0 to 1.13.0 Bumps [ruby-progressbar](https://github.com/jfelchner/ruby-progressbar) from 1.11.0 to 1.13.0. - [Release notes](https://github.com/jfelchner/ruby-progressbar/releases) - [Changelog](https://github.com/jfelchner/ruby-progressbar/blob/master/CHANGELOG.md) - [Commits](https://github.com/jfelchner/ruby-progressbar/compare/releases/v1.11.0...releases/v1.13.0) --- updated-dependencies: - dependency-name: ruby-progressbar dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e9309130135473..dbadd53bb01ae9 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ gem 'rails-settings-cached', '~> 0.6' gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis'] gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' gem 'rqrcode', '~> 2.1' -gem 'ruby-progressbar', '~> 1.11' +gem 'ruby-progressbar', '~> 1.13' gem 'sanitize', '~> 6.0' gem 'scenic', '~> 1.6' gem 'sidekiq', '~> 6.5' diff --git a/Gemfile.lock b/Gemfile.lock index ecaa6f29ada036..6199eb3c9d7ea0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -631,7 +631,7 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-saml (1.13.0) nokogiri (>= 1.10.5) rexml @@ -879,7 +879,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.5) rubocop (~> 1.30) rubocop-rails (~> 2.15) - ruby-progressbar (~> 1.11) + ruby-progressbar (~> 1.13) rucaptcha! sanitize (~> 6.0) scenic (~> 1.6)