Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump concurrent-ruby from 1.1.10 to 1.2.2 #966

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ GEM
cocoon (1.2.15)
coderay (1.1.3)
color_diff (0.1)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
connection_pool (2.2.5)
cose (1.2.1)
cbor (~> 0.5.9)
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ The Docker images are listed [here](https://hub.docker.com/r/mashirozx/mastodon/
</tr>
</table>

## 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).
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/content_security_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/mastodon/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def flags
end

def suffix
'~hello'
''
end

def to_a
Expand Down