9506d9cafc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
5 years ago
07abea7ba8
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
5 years ago
9fa40f1f0a
Bump capistrano from 3.11.1 to 3.11.2 ( #12012 )
...
* Bump capistrano from 3.11.1 to 3.11.2
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.1...v3.11.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Bump capistrano from 3.11.1 to 3.11.2
5 years ago
bbf15e78ba
Bump pkg-config from 1.3.8 to 1.3.9 ( #12011 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.3.8 to 1.3.9.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.3.8...1.3.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
29d2d28119
Bump faker from 2.4.0 to 2.5.0 ( #12010 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0737180a83
Bump tty-command from 0.8.2 to 0.9.0 ( #12009 )
...
Bumps [tty-command](https://github.com/piotrmurach/tty-command ) from 0.8.2 to 0.9.0.
- [Release notes](https://github.com/piotrmurach/tty-command/releases )
- [Changelog](https://github.com/piotrmurach/tty-command/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-command/compare/v0.8.2...v0.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
66a903d1ad
Bump webmock from 3.7.5 to 3.7.6 ( #12008 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.5 to 3.7.6.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.5...v3.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ac7c1fb62c
Bump derailed_benchmarks from 1.3.6 to 1.4.0 ( #12007 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.3.6 to 1.4.0.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases )
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md )
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.3.6...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0baf951700
Bump patch level of Ruby ( #12070 )
...
Cosmetic change: patch level for the released 2.6.5 is p114.
5 years ago
c2d6ef1b64
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
5 years ago
38d2632b90
Add parallelization to `tootctl search deploy` ( #12051 )
...
* Add parallel gem
* Modify parallel option in tootctl search deploy
* Add paralell option to tootctl search deploy
* Change 1 to false
* Clean up
* Rename --parallel to --processes
5 years ago
216594fe26
Use Ruby 2.6.5 ( #12049 )
5 years ago
cc94c90bf1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
5 years ago
fe3de62124
Use Ruby-2.6.4 ( #11942 )
5 years ago
161b0a0958
Hide error message on /heath ( #11947 )
...
* Hide error message on /heath
* update health_check
5 years ago
aa6911a605
Bump puma from 4.1.1 to 4.2.0 ( #11939 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
90f8e64e0a
Bump doorkeeper from 5.2.0 to 5.2.1 ( #11934 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.0...v5.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
fd1efcaeac
Bump webmock from 3.7.3 to 3.7.5 ( #11936 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.3 to 3.7.5.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.3...v3.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4d2b257240
Bump simplecov from 0.17.0 to 0.17.1 ( #11932 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3be4ee3a63
Bump chewy from 5.0.0 to 5.0.1 ( #11935 )
...
Bumps [chewy](https://github.com/toptal/chewy ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/toptal/chewy/releases )
- [Changelog](https://github.com/toptal/chewy/blob/master/CHANGELOG.md )
- [Commits](https://github.com/toptal/chewy/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3adb0ad5ab
Bump redis from 4.1.2 to 4.1.3 ( #11938 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/redis/redis-rb/releases )
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.2...v4.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7d821c828f
Bump faker from 2.3.0 to 2.4.0 ( #11933 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.3.0...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5ce267efd0
Bump doorkeeper from 5.1.0 to 5.2.0 ( #11856 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.1.0...v5.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4837d6275a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
5 years ago
605b78c717
Bump capybara from 3.28.0 to 3.29.0 ( #11854 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.28.0 to 3.29.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.28.0...3.29.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f31ee4685c
Bump webmock from 3.7.1 to 3.7.3 ( #11853 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.1 to 3.7.3.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.1...v3.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b02f5b9463
Bump tzinfo-data from 1.2019.2 to 1.2019.3 ( #11857 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2019.2 to 1.2019.3.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.2...v1.2019.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3f69dab8e0
Bump faker from 2.2.2 to 2.3.0 ( #11858 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.2 to 2.3.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.2...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
85afa898cd
Bump puma from 4.1.0 to 4.1.1 ( #11855 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.1.0...v4.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f86b585390
Revert "Bump webpush from 0.3.8 to 1.0.0 ( #11614 )" ( #11840 )
...
This reverts commit c812a03e00
5 years ago
2e38d889a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
5 years ago
666c1a8a06
Change tootctl to use inline parallelization instead of Sidekiq ( #11776 )
...
- Remove --background option
- Add --concurrency(=5) option
- Add progress bars
5 years ago
c812a03e00
Bump webpush from 0.3.8 to 1.0.0 ( #11614 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.8 to 1.0.0.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.8...v1.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e3b216b2d8
Bump fastimage from 2.1.5 to 2.1.7 ( #11785 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.5 to 2.1.7.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.5...v2.1.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0dc9d8f95d
Bump sanitize from 5.0.0 to 5.1.0 ( #11786 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.0.0...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3ab5be74af
Bump mime-types from 3.2.2 to 3.3 ( #11788 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.2.2 to 3.3.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases )
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md )
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.2.2...v3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a019318f94
Bump json-ld-preloaded from 3.0.3 to 3.0.4 ( #11790 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.3...3.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9c1b1e9ca1
Bump oj from 3.9.0 to 3.9.1 ( #11789 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5265487ea0
Bump faker from 2.2.1 to 2.2.2 ( #11787 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.1...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4b6bf21161
Bump devise from 4.7.0 to 4.7.1 ( #11784 )
...
* Bump devise from 4.7.0 to 4.7.1
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.0...v4.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* bcrypt (3.1.12)
5 years ago
7544167f3c
Add healthcheck endpoint for web ( #11770 )
5 years ago
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
41152c7b99
Bump addressable from 2.6.0 to 2.7.0 ( #11732 )
...
Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.6.0...addressable-2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7599b4b3b6
Bump capistrano from 3.11.0 to 3.11.1 ( #11731 )
...
* Bump capistrano from 3.11.0 to 3.11.1
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* 3.11.1
5 years ago
17bb2b5e06
Bump aws-sdk-s3 from 1.46.0 to 1.48.0 ( #11729 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.46.0 to 1.48.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.46.0...v1.48.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3d1a8d1eca
Bump rubocop-rails from 2.3.1 to 2.3.2 ( #11728 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
decfba58ab
Bump bootsnap from 1.4.4 to 1.4.5 ( #11730 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.4...v1.4.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
908db96571
Bump faker from 2.1.2 to 2.2.1 ( #11733 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.2...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
645f9ffe45
Bump webmock from 3.6.2 to 3.7.1 ( #11734 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.2 to 3.7.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.2...v3.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
741b53651e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
5 years ago
Thibaut Girka
dependabot-preview[bot]
Daigo 3 Dango
Takeshi Umeda
Yamagishi Kazutoshi
Eugen Rochko