mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 07:05:11 +01:00
Code Issues Projects Releases Wiki Activity
11,640 Commits 136 Branches 269 Tags 918 MiB
9c61dadc0d
Commit Graph

950 Commits

Author SHA1 Message Date
dependabot-preview[bot]
56531d646e
Bump sidekiq from 5.2.7 to 6.0.4 (#11727) 
* Bump sidekiq from 5.2.7 to 6.0.0

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.7...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Sidekiq::Logger.logger -> Sidekiq.logger

* Drop support Ruby 2.4

* update

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2020-03-21 12:04:54 +09:00
dependabot-preview[bot]
85ff31b904
[Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229) 
Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-21 03:23:25 +01:00
dependabot-preview[bot]
c39ad4ab2f
Bump capistrano from 3.11.2 to 3.12.1 (#13264) 
* Bump capistrano from 3.11.2 to 3.12.1

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump capistrano from 3.11.2 to 3.12.1

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2020-03-18 21:48:03 +09:00
dependabot-preview[bot]
0b33d2b0f7
Bump webmock from 3.8.0 to 3.8.3 (#13265) 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.0 to 3.8.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.8.0...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 20:16:46 +09:00
dependabot-preview[bot]
e2b816b4da
Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233) 
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 20:02:34 +09:00
dependabot-preview[bot]
1780f00948
Bump simple_form from 5.0.1 to 5.0.2 (#13231) 
Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.1...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 20:01:35 +09:00
dependabot-preview[bot]
897ff630e7
Bump json-ld from 3.1.0 to 3.1.1 (#13230) 
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 20:00:20 +09:00
dependabot-preview[bot]
7088633ae1
Bump cld3 from 3.2.6 to 3.3.0 (#13107) 
* Bump cld3 from 3.2.6 to 3.3.0

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix compatibility with cld3 3.3.0

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2020-03-09 00:12:52 +01:00
Thibaut Girka
c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
 2020-03-08 19:38:53 +01:00
dependabot-preview[bot]
764b89939f
Bump doorkeeper from 5.2.3 to 5.3.1 (#13144) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.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.3...v.5.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-08 16:22:12 +01:00
dependabot-preview[bot]
66b014ca50
Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:48:02 +09:00
dependabot-preview[bot]
95155ecbe7
Bump oj from 3.10.1 to 3.10.3 (#13187) 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.3.
- [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.10.1...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:46:56 +09:00
dependabot-preview[bot]
74c2490cdd
Bump strong_migrations from 0.5.1 to 0.6.2 (#13071) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 21:44:44 +09:00
ThibG
7d575c669e
Bump puma from 4.3.2 to 4.3.3 (#13177) 
This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
 2020-03-01 22:25:13 +01:00
Thibaut Girka
13ef4d5fb0 Update puma from 4.3.2 to 4.3.3 
Fixes #1294

This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
 2020-03-01 20:54:02 +01:00
Thibaut Girka
b0a7cb71be Update glitch-soc-specific dependencies 
- drop html2text which has been unused in a while
- update redcarpet
 2020-02-29 22:32:33 +01:00
Thibaut Girka
427ef4948a Merge branch 'master' into glitch-soc/merge-upstream 2020-02-29 12:20:54 +01:00
ThibG
5393b187c4
Fix elasticsearch-api and faraday incompatibilities (#13166) 2020-02-29 03:05:02 +01:00
dependabot-preview[bot]
047fde18c3
[Security] Bump puma from 4.3.1 to 4.3.2 (#13167) 
Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2. **This update includes a security fix.**
- [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.3.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 02:57:14 +01:00
Thibaut Girka
85933bc9ff Merge branch 'master' into glitch-soc/merge-upstream 2020-02-25 14:28:13 +01:00
dependabot-preview[bot]
89a9eeb675
Bump rack from 2.1.2 to 2.2.2 (#13108) 
Bumps [rack](https://github.com/rack/rack) from 2.1.2 to 2.2.2.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.1.2...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 09:24:16 +09:00
Thibaut Girka
e037002401 Merge branch 'master' into glitch-soc/merge-upstream 2020-02-19 23:04:18 +01:00
dependabot-preview[bot]
7584342d83
Bump simplecov from 0.18.1 to 0.18.2 (#13106) 
Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.1 to 0.18.2.
- [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.18.1...v0.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 02:27:19 +09:00
dependabot-preview[bot]
fe388e5fe9
Bump pkg-config from 1.4.0 to 1.4.1 (#13105) 
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.4.0 to 1.4.1.
- [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.4.0...1.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 02:24:20 +09:00
dependabot-preview[bot]
28dec37101
Bump nokogiri from 1.10.7 to 1.10.8 (#13110) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 02:22:43 +09:00
dependabot-preview[bot]
879b71eacb
Bump json-ld-preloaded from 3.0.6 to 3.1.0 (#12982) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.6 to 3.1.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.6...3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 21:26:53 +09:00
dependabot-preview[bot]
b189b93c25
Bump rubocop-rails from 2.4.1 to 2.4.2 (#12984) 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.1 to 2.4.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.4.1...v2.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 21:18:07 +09:00
dependabot-preview[bot]
432e00af7c
Bump capybara from 3.30.0 to 3.31.0 (#12983) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.30.0 to 3.31.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.30.0...3.31.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 20:51:14 +09:00
dependabot-preview[bot]
925159abf0
Bump simplecov from 0.17.1 to 0.18.1 (#13027) 
Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.17.1 to 0.18.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.1...v0.18.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 20:46:25 +09:00
dependabot-preview[bot]
dc8d57d092
Bump pry-byebug from 3.7.0 to 3.8.0 (#12985) 
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.7.0...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 20:46:05 +09:00
dependabot-preview[bot]
170e8e0725
Bump letter_opener_web from 1.3.4 to 1.4.0 (#13028) 
Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web) from 1.3.4 to 1.4.0.
- [Release notes](https://github.com/fgrehm/letter_opener_web/releases)
- [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.3.4...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 20:28:22 +09:00
Thibaut Girka
dae5e446fe Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.
 2020-02-09 12:15:55 +01:00
mayaeh
57c42c20c0
Bump httplog from 1.4.1 to 1.4.2 (#13059) 2020-02-09 12:05:31 +01:00
Lynne
a2cfe3daaa update gemfile.lock for httplog 1.4.1 2020-02-09 09:49:28 +01:00
mayaeh
d9a4ce4ca2
Bump httplog from 1.4.0 to 1.4.1. (#13051) 
httplog 1.4.0 is yanked.
 2020-02-08 21:39:44 +01:00
Thibaut Girka
44744e3ce1 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-28 19:15:03 +01:00
ThibG
1051de0165 Fix Gemfile.lock (#12995) 
* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues

* Fix deprecation warnings

* Fix Gemfile.lock

* More changes to catch Gemfile.lock issues
 2020-01-28 18:50:44 +01:00
Shlee
720fee0685 Bump Rack from 2.0.8 to 2.1.2 (#12991) 
* Update Gemfile

* Update Gemfile.lock
 2020-01-28 15:23:16 +01:00
Thibaut Girka
c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
 2020-01-27 15:46:50 +01:00
Daigo 3 Dango
7b8e0d3477 Explicitly install rack gem (#12972) 
Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`:

```
NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...>
```
 2020-01-27 11:06:34 +01:00
Thibaut Girka
dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
 2020-01-20 18:31:11 +01:00
dependabot-preview[bot]
06f6995860 Bump httplog from 1.3.3 to 1.4.0 (#12902) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.3.3 to 1.4.0.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.3.3...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 23:45:10 +09:00
Thibaut Girka
45709d6987 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
 2020-01-20 15:00:22 +01:00
dependabot-preview[bot]
51182843d4 Bump parallel_tests from 2.30.0 to 2.30.1 (#12901) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.0 to 2.30.1.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.0...v2.30.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 22:08:14 +09:00
dependabot-preview[bot]
850a217784 Bump faker from 2.10.0 to 2.10.1 (#12899) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.0 to 2.10.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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 21:37:26 +09:00
dependabot-preview[bot]
9f6785592b Bump capistrano-rbenv from 2.1.4 to 2.1.6 (#12898) 
Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv) from 2.1.4 to 2.1.6.
- [Release notes](https://github.com/capistrano/rbenv/releases)
- [Changelog](https://github.com/capistrano/rbenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/rbenv/compare/v2.1.4...v2.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 20:58:56 +09:00
dependabot-preview[bot]
4bdbaf809b Bump webmock from 3.7.6 to 3.8.0 (#12900) 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.6 to 3.8.0.
- [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.6...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 12:46:03 +01:00
dependabot-preview[bot]
4078eda312 Bump i18n-tasks from 0.9.29 to 0.9.30 (#12903) 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.29 to 0.9.30.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.29...v0.9.30)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 12:45:23 +01:00
dependabot-preview[bot]
69d510a980 Bump oj from 3.10.0 to 3.10.1 (#12897) 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.0 to 3.10.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.10.0...v3.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-20 12:43:52 +01:00
dependabot-preview[bot]
a31139c9f1 Bump browser from 2.7.1 to 3.0.3 (#12850) 
Bumps [browser](https://github.com/fnando/browser) from 2.7.1 to 3.0.3.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v2.7.1...v3.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-15 10:24:35 +09:00
Yamagishi Kazutoshi
114ee287dc Remove derailed_benchmarks dependency (#12861) 2020-01-14 00:43:12 +01:00
dependabot-preview[bot]
08e540f01d Bump pg from 1.2.1 to 1.2.2 (#12854) 
Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 03:09:31 +09:00
dependabot-preview[bot]
031a432559 Bump ox from 2.11.0 to 2.12.1 (#12853) 
Bumps [ox](https://github.com/ohler55/ox) from 2.11.0 to 2.12.1.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.11.0...v2.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 03:02:20 +09:00
dependabot-preview[bot]
2950b09706 Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 (#12852) 
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0. This release includes the previously tagged commit.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](e742697a09...3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 03:01:43 +09:00
dependabot-preview[bot]
a0ad1f5cda Bump rubocop from 0.78.0 to 0.79.0 (#12851) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.78.0 to 0.79.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.78.0...v0.79.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-14 02:58:56 +09:00
Thibaut Girka
83f8bf48d9 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-13 13:14:35 +01:00
dependabot-preview[bot]
d20eddc6b5 Bump rubocop-rails from 2.4.0 to 2.4.1 (#12780) 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.0 to 2.4.1.
- [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.4.0...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 02:53:57 +09:00
Thibaut Girka
980c004f06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one
 2020-01-12 15:57:34 +01:00
ThibG
24cd2126c6 Fix Ruby 2.7 support (#12831) 
- update http gem to avoid errors
- update blurhash gem to avoid shared object loading error
- update goldfinger gem so the http gem could be updated
- update json gem to avoid warnings
 2020-01-12 15:49:30 +01:00
mayaeh
c6287d5855 Remove ostatus2 gem from lockfile (#12826) 2020-01-12 03:13:01 +01:00
mayaeh
998ba16f13 Update lockfile for #12800 (#12825) 2020-01-11 21:49:59 +01:00
ThibG
57e2833f6a Remove dependency on OStatus2 gem (#12822) 2020-01-11 21:36:53 +01:00
dependabot-preview[bot]
2a5dee0f08 Bump rqrcode from 0.10.1 to 1.1.2 (#12357) 
Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 0.10.1 to 1.1.2.
- [Release notes](https://github.com/whomwah/rqrcode/releases)
- [Commits](https://github.com/whomwah/rqrcode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-11 19:51:04 +09:00
dependabot-preview[bot]
d1f68fb589 Bump rdf-normalize from 0.3.3 to 0.4.0 (#12785) 
Bumps [rdf-normalize](https://github.com/gkellogg/rdf-normalize) from 0.3.3 to 0.4.0.
- [Release notes](https://github.com/gkellogg/rdf-normalize/releases)
- [Commits](https://github.com/gkellogg/rdf-normalize/compare/0.3.3...0.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-11 07:02:16 +09:00
Thibaut Girka
578553ba05 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-07 16:28:59 +01:00
dependabot-preview[bot]
7c57c3d2ff Bump pg from 1.2.0 to 1.2.1 (#12783) 
Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.0...v1.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 23:52:23 +09:00
dependabot-preview[bot]
746c4131ec Bump aws-sdk-s3 from 1.59.0 to 1.60.1 (#12784) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.59.0 to 1.60.1.
- [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.59.0...v1.60.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 23:03:05 +09:00
dependabot-preview[bot]
1d039c27f8 Bump bullet from 6.0.2 to 6.1.0 (#12782) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 23:02:46 +09:00
dependabot-preview[bot]
974a015d95 Bump capybara from 3.29.0 to 3.30.0 (#12781) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.29.0 to 3.30.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.29.0...3.30.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 22:56:04 +09:00
mayaeh
bd42608be2 Update lockfile for #12758 (#12762) 2020-01-05 02:25:07 +01:00
Thibaut Girka
01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
 2020-01-04 23:04:42 +01:00
Shlee
2ecc7802ca Gemfile Updates - Others (#12761) 
* Update Gemfile.lock

* Update Gemfile

* Update Gemfile.lock

* Update Gemfile.lock

* Update Gemfile

* Update Gemfile.lock
 2020-01-04 22:48:57 +01:00
Shlee
882a7d3d14 Gemfile Updates - fixes warnings (#12759) 
* Update Gemfile.lock

* Update Gemfile.lock

* Update Gemfile
 2020-01-04 22:48:18 +01:00
dependabot-preview[bot]
5c8a8bf798 Bump stackprof from 0.2.14 to 0.2.15 (#12726) 
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.14 to 0.2.15.
- [Release notes](https://github.com/tmm1/stackprof/releases)
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.14...v0.2.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 00:23:05 +09:00
dependabot-preview[bot]
d5f93ea618 Bump pg from 1.1.4 to 1.2.0 (#12725) 
Bumps [pg](https://github.com/ged/ruby-pg) from 1.1.4 to 1.2.0.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 00:21:51 +09:00
dependabot-preview[bot]
a439fc7f72 Bump redis-namespace from 1.6.0 to 1.7.0 (#12727) 
Bumps [redis-namespace](https://github.com/resque/redis-namespace) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/resque/redis-namespace/releases)
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md)
- [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 00:16:45 +09:00
dependabot-preview[bot]
333009d8b1 Bump faker from 2.9.0 to 2.10.0 (#12728) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.9.0 to 2.10.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.9.0...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 00:15:16 +09:00
dependabot-preview[bot]
9fe5ba82c5 Bump derailed_benchmarks from 1.4.2 to 1.4.3 (#12729) 
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.4.2 to 1.4.3.
- [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.4.2...v1.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 00:13:25 +09:00
dependabot-preview[bot]
a80fb33be4 Bump rack-cors from 1.1.0 to 1.1.1 (#12730) 
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/cyu/rack-cors/releases)
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cyu/rack-cors/compare/v1.1.0...v1.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 23:58:24 +09:00
Shlee
7a81346d55 Circleci - Upgrade to Buster Images (#12705) 
* Update config.yml

* Update Gemfile.lock
 2019-12-29 17:00:43 +01:00
Thibaut Girka
ad29279214 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`
- `package.json`
 2019-12-28 17:48:40 +01:00
dependabot-preview[bot]
ea08fc7dd2 Bump rubocop from 0.77.0 to 0.78.0 (#12677) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.77.0 to 0.78.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.77.0...v0.78.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 02:27:14 +09:00
dependabot-preview[bot]
ab25e9e691 Bump faker from 2.8.1 to 2.9.0 (#12680) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.1 to 2.9.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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 02:25:14 +09:00
dependabot-preview[bot]
d22f38bb6e Bump strong_migrations from 0.5.0 to 0.5.1 (#12679) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.0...v0.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-23 22:38:19 +01:00
dependabot-preview[bot]
e0c2ecb1d3 Bump rails from 5.2.4 to 5.2.4.1 (#12682) 
Bumps [rails](https://github.com/rails/rails) from 5.2.4 to 5.2.4.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.4...v5.2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-23 22:37:35 +01:00
dependabot-preview[bot]
cb4831a5ac Bump rack-attack from 6.2.1 to 6.2.2 (#12681) 
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v6.2.1...v6.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-23 22:36:06 +01:00
dependabot-preview[bot]
28376b319b Bump oj from 3.9.2 to 3.10.0 (#12683) 
Bumps [oj](https://github.com/ohler55/oj) from 3.9.2 to 3.10.0.
- [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.2...v3.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-23 22:35:04 +01:00
Thibaut Girka
ab5ff638f2 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
 2019-12-19 13:52:54 +01:00
dependabot-preview[bot]
4dbf0a91b2 [Security] Bump rack from 2.0.7 to 2.0.8 (#12654) 
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. **This update includes a security fix.**
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 07:21:51 +09:00
dependabot-preview[bot]
45f8968404 Bump rails from 5.2.3 to 5.2.4 (#12584) 
* Bump rails from 5.2.3 to 5.2.4

Bumps [rails](https://github.com/rails/rails) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* sprockets ~> 3.7
 2019-12-18 08:58:53 +09:00
dependabot-preview[bot]
c436367c3c Bump json-ld-preloaded from 3.0.4 to 3.0.6 (#12361) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.4 to 3.0.6.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.4...3.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 04:04:30 +09:00
dependabot-preview[bot]
b2aeb0061a Bump webpacker from 4.2.0 to 4.2.2 (#12632) 
Bumps [webpacker](https://github.com/rails/webpacker) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.2.0...v4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:53:15 +09:00
dependabot-preview[bot]
99adf00d11 Bump doorkeeper from 5.2.2 to 5.2.3 (#12630) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.2 to 5.2.3.
- [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.2...v5.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:36:49 +09:00
dependabot-preview[bot]
d5fe624992 Bump stackprof from 0.2.13 to 0.2.14 (#12631) 
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.13 to 0.2.14.
- [Release notes](https://github.com/tmm1/stackprof/releases)
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.13...v0.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:34:20 +09:00
dependabot-preview[bot]
71b4e2dcbb Bump parallel_tests from 2.29.2 to 2.30.0 (#12634) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.2 to 2.30.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.2...v2.30.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:32:51 +09:00
dependabot-preview[bot]
ed015e2e3d Bump faker from 2.8.0 to 2.8.1 (#12633) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.0 to 2.8.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.8.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 10:19:20 +09:00
dependabot-preview[bot]
f4906f2cac [Security] Bump excon from 0.62.0 to 0.71.0 (#12638) 
Bumps [excon](https://github.com/excon/excon) from 0.62.0 to 0.71.0. **This update includes a security fix.**
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 23:53:38 +01:00
dependabot-preview[bot]
fb17814d4a Bump nokogiri from 1.10.5 to 1.10.7 (#12586) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.5 to 1.10.7.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.5...v1.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-13 02:57:44 +09:00
dependabot-preview[bot]
bc6141b085 Bump rubocop from 0.76.0 to 0.77.0 (#12585) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.76.0 to 0.77.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.76.0...v0.77.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-13 02:57:32 +09:00
Thibaut Girka
be4849c083 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
 2019-12-12 15:40:06 +01:00