luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 04:39:23 +00:00
Code Issues Projects Releases Wiki Activity
10307 commits 1 branch 0 tags 248 MiB
Commit graph

490 commits

Author SHA1 Message Date
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
 2019-06-26 23:19:22 +02:00
dependabot-preview[bot] 1afb8cac2f Bump aws-sdk-s3 from 1.42.0 to 1.43.0 (#11172) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.42.0 to 1.43.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.42.0...v1.43.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:45:32 +09:00
Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
 2019-06-19 18:36:16 +02:00
dependabot-preview[bot] 54438042f1 Bump capybara from 3.22.0 to 3.24.0 (#11100) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.22.0 to 3.24.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.22.0...3.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 23:23:13 +09:00
dependabot-preview[bot] 9639a7f87a Bump ox from 2.10.1 to 2.11.0 (#11101) 
Bumps ox from 2.10.1 to 2.11.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 22:50:20 +09:00
dependabot-preview[bot] f4539845e0 Bump webmock from 3.5.1 to 3.6.0 (#11031) 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.5.1 to 3.6.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.5.1...v3.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:17:45 +09:00
dependabot-preview[bot] f765cd97b2 Bump aws-sdk-s3 from 1.41.0 to 1.42.0 (#11030) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.41.0 to 1.42.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.41.0...v1.42.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:15:33 +09:00
Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
 2019-06-07 17:00:36 +02:00
Yamagishi Kazutoshi 70423ce81f require rubocop-rails in .rubocop.yml (#10974) 
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)"

This reverts commit 121d19d7fa.

* Disable Rails/HelperInstanceVariable
 2019-06-06 12:31:48 +02:00
Thibaut Girka 02b56c7e1a Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
Yamagishi Kazutoshi 121d19d7fa Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965) 2019-06-04 19:35:19 +02:00
Yamagishi Kazutoshi 3e56f95c73 Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
Yamagishi Kazutoshi 3f536f06d6 Use rubocop-rails (#10957) 2019-06-04 15:25:52 +02:00
dependabot-preview[bot] c11742dd9b Bump fuubar from 2.3.2 to 2.4.0 (#10947) 
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.2...releases/v2.4.0)
 2019-06-04 14:15:32 +09:00
Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
 2019-06-03 14:54:30 +02:00
dependabot-preview[bot] 5677172d86 Bump rubocop from 0.70.0 to 0.71.0 (#10901) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.70.0 to 0.71.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.70.0...v0.71.0)
 2019-05-30 23:17:54 +09:00
Thibaut Girka 06036081a0 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
dependabot-preview[bot] dee4f1878d Bump aws-sdk-s3 from 1.40.0 to 1.41.0 (#10892) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.40.0 to 1.41.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.40.0...v1.41.0)
 2019-05-30 12:58:22 +09:00
dependabot-preview[bot] fa48cf96de Bump capybara from 3.21.0 to 3.22.0 (#10893) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.21.0 to 3.22.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.21.0...3.22.0)
 2019-05-30 09:37:11 +09:00
dependabot-preview[bot] 26e290ae64 Bump strong_migrations from 0.3.1 to 0.4.0 (#10871) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.1 to 0.4.0.
- [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.3.1...v0.4.0)
 2019-05-29 18:22:59 +09:00
dependabot-preview[bot] 61ab5b0c83 Bump capybara from 3.20.2 to 3.21.0 (#10854) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.2 to 3.21.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.20.2...3.21.0)
 2019-05-29 11:21:22 +09:00
dependabot-preview[bot] 0b1c7150da Bump tty-prompt from 0.18.1 to 0.19.0 (#10870) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.18.1 to 0.19.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.18.1...v0.19.0)
 2019-05-29 11:10:24 +09:00
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
 2019-05-23 19:01:30 +02:00
dependabot[bot] ce8de3a6e5 Bump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.39.0 to 1.40.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.39.0...v1.40.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-22 22:31:05 +09:00
dependabot[bot] bc23de458e Bump rubocop from 0.69.0 to 0.70.0 (#10802) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.69.0 to 0.70.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.69.0...v0.70.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-22 22:09:10 +09:00
dependabot[bot] 4d65740663 Bump httplog from 1.2.2 to 1.3.0 (#10795) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.2.2 to 1.3.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/commits/v1.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-21 15:41:15 +09:00
Thibaut Girka 6e227ecb04 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
Thibaut Girka 94aef563b9 Add support for markdown-formatted toots 2019-05-17 23:51:14 +02:00
dependabot[bot] e976a9dfbd Bump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.38.0 to 1.39.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.38.0...v1.39.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 15:23:21 +09:00
dependabot[bot] 2310dd40fa Bump capybara from 3.19.1 to 3.20.0 (#10768) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.1 to 3.20.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.19.1...3.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 16:13:52 +09:00
dependabot[bot] 90093f1795 Bump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.1 to 1.38.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.36.1...v1.38.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 15:00:24 +09:00
Thibaut Girka 6badf2d252 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
dependabot[bot] 76901b65c4 Bump capybara from 3.18.0 to 3.19.1 (#10758) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.1.
- [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.18.0...3.19.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 15:01:47 +09:00
dependabot[bot] d90104204f Bump rubocop from 0.68.1 to 0.69.0 (#10762) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.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.68.1...v0.69.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 15:00:58 +09:00
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 2019-05-10 17:09:12 +02:00
dependabot[bot] 7e73a8b8bf Bump parallel_tests from 2.28.0 to 2.29.0 (#10716) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 15:12:55 +09:00
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
dependabot[bot] ecbea2e3c6 Bump rack-attack from 5.4.2 to 6.0.0 (#10599) 
* Bump rack-attack from 5.4.2 to 6.0.0

Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.0.
- [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/v5.4.2...v6.0.0)

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

* fix payload[:request]
 2019-05-03 16:16:11 +02:00
dependabot[bot] 61e28b0ccc Bump scss_lint from 0.57.1 to 0.58.0 (#10678) 
Bumps [scss_lint](https://github.com/sds/scss-lint) from 0.57.1 to 0.58.0.
- [Release notes](https://github.com/sds/scss-lint/releases)
- [Changelog](https://github.com/sds/scss-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/scss-lint/compare/v0.57.1...v0.58.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-03 17:29:53 +09:00
dependabot[bot] 7c94b190c8 Bump bullet from 5.9.0 to 6.0.0 (#10635) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.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/5.9.0...6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 18:05:49 +02:00
dependabot[bot] feff0fc9b2 Bump rubocop from 0.67.2 to 0.68.0 (#10654) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.2 to 0.68.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.67.2...v0.68.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 18:05:22 +02:00
Eugen Rochko fba96c808d
Add blurhash (#10630) 
* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues
 2019-04-27 03:24:09 +02:00
Thibaut Girka 7783ec921b Merge branch 'master' into glitch-soc/merge-upstream 2019-04-24 15:25:22 +02:00
dependabot[bot] db61383f82 Bump capybara from 3.17.0 to 3.18.0 (#10626) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.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.17.0...3.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 18:53:52 +09:00
dependabot[bot] 703cdf2a0c Bump capybara from 3.16.2 to 3.17.0 (#10602) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.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.16.2...3.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 00:54:51 +02:00
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
 2019-04-22 20:40:04 +02:00
dependabot[bot] 5c34163dbc Bump doorkeeper from 5.0.2 to 5.1.0 (#10598) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 15:02:59 +02:00
dependabot[bot] c9441bf82e Bump cld3 from 3.2.3 to 3.2.4 (#10617) 
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.3...v3.2.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 14:54:19 +02:00
dependabot[bot] a5c0aae984 Bump lograge from 0.10.0 to 0.11.0 (#10588) 
Bumps [lograge](https://github.com/roidrage/lograge) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.10.0...v0.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-21 04:49:05 +02:00
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
 2019-04-08 15:57:56 +02:00
dependabot[bot] fb8557e652 Bump rubocop from 0.66.0 to 0.67.1 (#10475) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.66.0 to 0.67.1.
- [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.66.0...v0.67.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-06 11:41:19 +09:00
Thibaut Girka 4444d8f9b3 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00
dependabot[bot] 3b1c64cadc Bump capybara from 3.15.0 to 3.16.0 (#10415) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.15.0 to 3.16.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.15.0...3.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-29 22:06:56 +09:00
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
 2019-03-28 13:01:33 +01:00
dependabot[bot] 24d5b6f9e3 Bump aws-sdk-s3 from 1.35.0 to 1.36.0 (#10406) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.35.0 to 1.36.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.35.0...v1.36.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 16:25:27 +09:00
dependabot[bot] 85629bf3d3 Bump rails from 5.2.2.1 to 5.2.3 (#10407) 
Bumps [rails](https://github.com/rails/rails) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 16:25:11 +09:00
dependabot[bot] f46f67d984 [Security] Bump devise from 4.5.0 to 4.6.2 (#10394) 
Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.2. **This update includes security fixes.**
- [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.5.0...v4.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 02:20:53 +01:00
dependabot[bot] 319bce3d9d Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396) 
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 17:45:31 +01:00
Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
 2019-03-26 16:02:54 +01:00
Thibaut Girka fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
 2019-03-26 16:01:59 +01:00
dependabot[bot] ac0cc692f5 Bump aws-sdk-s3 from 1.34.0 to 1.35.0 (#10369) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.34.0 to 1.35.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.34.0...v1.35.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-25 20:54:00 +01:00
dependabot[bot] d23ff0c5c9 Bump aws-sdk-s3 from 1.33.0 to 1.34.0 (#10342) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.33.0 to 1.34.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.33.0...v1.34.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 22:42:59 +09:00
Thibaut Girka edd5441112 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-22 13:05:17 +01:00
dependabot[bot] 88be18125e Bump capybara from 3.14.0 to 3.15.0 (#10330) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.14.0 to 3.15.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.14.0...3.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 19:02:21 +09:00
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
 2019-03-20 13:54:00 +01:00
dependabot[bot] 941b0adcae Bump aws-sdk-s3 from 1.32.0 to 1.33.0 (#10319) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.32.0 to 1.33.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.32.0...v1.33.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-19 16:34:21 +01:00
dependabot[bot] c95e3a2e34 Bump rubocop from 0.65.0 to 0.66.0 (#10318) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.66.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.65.0...v0.66.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-19 16:34:04 +01:00
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
 2019-03-18 18:03:27 +01:00
dependabot[bot] f85b66eb8c Bump brakeman from 4.4.0 to 4.5.0 (#10309) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.4.0...v4.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 14:41:44 +01:00
Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
  Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
  Upstream removed the “Authorized followers” page and associated
  translations. This is too close in the file to our glitch-soc-specific
  “flavour” string. No actual conflict.
- config/locales/ja.yml
  Same as above.
- config/locales/pl.yml
  Same as above.
- config/navigation.rb
  No real conflict. New route added too close to the glitch-soc-specific
  “flavours” one.
- config/webpack/configuration.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpack/loaders/babel.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
  The contents of this file have been moved to package.json.
- config/webpack/shared.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpacker.yml
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- jest.config.js
  The contents of this file have been moved to package.json.
- package.json
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- yarn.lock
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
 2019-03-16 14:14:20 +01:00
Yamagishi Kazutoshi 8347479f5d Bump webpacker from 3.5.5 to 4.0.2 (#10277) 
Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.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/v3.5.5...v4.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2019-03-15 15:05:31 +01:00
dependabot[bot] 5a9978f02a Bump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.31.0 to 1.32.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/1.31.0...v1.32.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-15 14:53:34 +01:00
Thibaut Girka f3e7634156 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 17:31:02 +01:00
dependabot[bot] c8122e84cc Bump aws-sdk-s3 from 1.30.1 to 1.31.0 (#10236) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.30.1 to 1.31.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/1.30.1...1.31.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-11 15:29:07 +01:00
Thibaut Girka 4806232997 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 11:29:06 +01:00
dependabot[bot] ad6f7ea250 Bump active_record_query_trace from 1.5.4 to 1.6 (#10192) 
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.5.4 to 1.6.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases)
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/v1.6/HISTORY.md)
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.5.4...v1.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-06 14:58:13 +09:00
Thibaut Girka 2267eee356 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-28 21:35:53 +01:00
dependabot[bot] 34315fcda5 Bump capybara from 3.13.2 to 3.14.0 (#10119) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.13.2 to 3.14.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.13.2...3.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-27 15:02:57 +01:00
Thibaut Girka 0158937fc2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c9.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.
 2019-02-26 17:04:44 +01:00
dependabot[bot] 775e835ed6 Bump rubocop from 0.64.0 to 0.65.0 (#10112) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.64.0 to 0.65.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.64.0...v0.65.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-25 15:56:35 +01:00
dependabot[bot] c07e59031f Bump dotenv-rails from 2.6.0 to 2.7.1 (#10114) 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.6.0 to 2.7.1.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.6.0...v2.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-25 15:55:53 +01:00
dependabot[bot] 4532833498 Bump pry-byebug from 3.6.0 to 3.7.0 (#10098) 
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.6.0 to 3.7.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.6.0...v3.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-22 20:06:01 +09:00
Thibaut Girka 06cc04fd23 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
dependabot[bot] 3d374ed18b Bump bootsnap from 1.3.2 to 1.4.0 (#10022) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.3.2 to 1.4.0.
- [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.3.2...v1.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-13 02:55:06 +01:00
Thibaut Girka 0e34e91661 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-12 20:32:48 +01:00
dependabot[bot] 241661e009 Bump rubocop from 0.63.1 to 0.64.0 (#10006) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.1 to 0.64.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.63.1...v0.64.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-12 05:11:06 +01:00
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
 2019-02-10 21:10:09 +01:00
dependabot[bot] 3031b8a8f2 Bump parallel_tests from 2.27.1 to 2.28.0 (#9985) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.1 to 2.28.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-10 18:17:34 +01:00
dependabot[bot] e28fe2ef26 Bump microformats from 4.0.7 to 4.1.0 (#9980) 
Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.0.7 to 4.1.0.
- [Release notes](https://github.com/microformats/microformats-ruby/releases)
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-06 16:46:37 +01:00
dependabot[bot] c5071f2d78 Bump capybara from 3.12.0 to 3.13.2 (#9935) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.2.
- [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.12.0...3.13.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-03 03:40:40 +01:00
Thibaut Girka 04e2c67389 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
dependabot[bot] c30287cf7c Bump addressable from 2.5.2 to 2.6.0 (#9888) 
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.6.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.5.2...addressable-2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-21 21:38:00 +09:00
Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream 
No conflicts.
 2019-01-19 18:28:37 +01:00
dependabot[bot] bf31f394fb Bump json-ld from 2.2.1 to 3.0.2 (#8804) 
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 2.2.1 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/2.2.1...3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 16:02:29 +01:00
dependabot[bot] f424e99e46 Bump brakeman from 4.3.1 to 4.4.0 (#9848) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.3.1...v4.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 15:57:41 +01:00
dependabot[bot] 451ae6896d Bump rubocop from 0.62.0 to 0.63.0 (#9827) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.62.0 to 0.63.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.62.0...v0.63.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-17 22:21:32 +09:00
Thibaut Girka dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/simple_form.pl.yml
 2019-01-16 14:20:07 +01:00
Eugen Rochko ee5e24807f
Add tootctl domains crawl (#9809) 2019-01-15 09:24:35 +01:00
dependabot[bot] 5ac425ad28 Bump sidekiq-unique-jobs from 5.0.10 to 6.0.8 (#9801) 
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 5.0.10 to 6.0.8.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v5.0.10...v6.0.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-14 09:18:55 +00:00
dependabot[bot] 944de8a6c9 Bump dotenv-rails from 2.5.0 to 2.6.0 (#9803) 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-14 09:13:34 +00:00