ace6bd3570
Bump capybara from 3.20.0 to 3.20.2 ( #10794 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.20.0 to 3.20.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.20.0...3.20.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-20 15:18:28 +09:00
6e227ecb04
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-18 10:04:32 +02:00
94aef563b9
Add support for markdown-formatted toots
2019-05-17 23:51:14 +02:00
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
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
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
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
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
5a24275202
Bump brakeman from 4.5.0 to 4.5.1 ( #10757 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.5.0 to 4.5.1.
- [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.5.0...v4.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-14 15:01:22 +09:00
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
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
fbff73eccb
Bump redis from 4.1.0 to 4.1.1 ( #10722 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.1.0 to 4.1.1.
- [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.0...v4.1.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-07 14:47:46 +09:00
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
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-05 12:28:10 +02:00
f0865171fe
Bump blurhash from 0.1.2 to 0.1.3 ( #10700 )
2019-05-04 22:52:54 +02:00
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
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
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
153b4ffc78
Bump fabrication from 2.20.1 to 2.20.2 ( #10677 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.20.1 to 2.20.2.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/compare/2.20.1...2.20.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-03 15:01:38 +09:00
699109b954
Bump rubocop from 0.68.0 to 0.68.1 ( #10658 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.0 to 0.68.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.68.0...v0.68.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-01 15:49:16 +09:00
825d5c79b7
Bump annotate from 2.7.4 to 2.7.5 ( #10651 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc )
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.4...2.7.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-30 18:06:09 +02:00
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
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
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
8f4c34669f
Bump bootsnap from 1.4.3 to 1.4.4 ( #10634 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.3 to 1.4.4.
- [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.3...v1.4.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-25 13:36:56 +02:00
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +02:00
80bbf40ff1
Bump sidekiq from 5.2.6 to 5.2.7 ( #10627 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.6 to 5.2.7.
- [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.6...v5.2.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-23 16:39:06 +02:00
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
f99bfb9496
[Security] Bump nokogiri from 1.10.2 to 1.10.3 ( #10620 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [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.2...v1.10.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-23 10:02:58 +09:00
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
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
fd9f5a467f
Bump aws-sdk-s3 from 1.36.0 to 1.36.1 ( #10618 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.36.0 to 1.36.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.36.0...v1.36.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-22 15:03:20 +02:00
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
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
aa484e2cb3
Bump webpush from 0.3.7 to 0.3.8 ( #10592 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.7 to 0.3.8.
- [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.7...v0.3.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-21 04:49:44 +02:00
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
268417daf3
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-19 10:44:10 +02:00
15ec1a738e
Bump sidekiq from 5.2.5 to 5.2.6 ( #10582 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.5 to 5.2.6.
- [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.5...v5.2.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-16 22:00:56 +09:00
c469e48e03
Bump sidekiq-unique-jobs from 6.0.12 to 6.0.13 ( #10580 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.12 to 6.0.13.
- [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/v6.0.12...v6.0.13 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-16 22:00:15 +09:00
d20b1bab24
Bump oj from 3.7.11 to 3.7.12 ( #10581 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-15 19:51:10 +09:00
9588cf82ce
Bump rubocop from 0.67.1 to 0.67.2 ( #10500 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.67.1 to 0.67.2.
- [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.1...v0.67.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-13 21:24:44 +09:00
bce757fdd8
Bump capybara from 3.16.1 to 3.16.2 ( #10552 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.1 to 3.16.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.16.1...3.16.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-13 21:24:19 +09:00
5085559b15
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
0f3719f16f
Bump hamlit-rails from 0.2.2 to 0.2.3 ( #10522 )
...
Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails ) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/mfung/hamlit-rails/releases )
- [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.2...v0.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-09 17:23:52 +09:00
819d053be8
Bump bootsnap from 1.4.2 to 1.4.3 ( #10523 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.2 to 1.4.3.
- [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.2...v1.4.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-09 17:23:18 +09:00
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
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
1682ac5717
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/following_accounts_controller.rb
Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
Some code has been change upstream, but it has been
moved to app/javascript/core/settings.js in glitch-soc.
Applied the changes there.
2019-04-04 14:53:52 +02:00
f86b2d8edb
Bump i18n-tasks from 0.9.28 to 0.9.29 ( #10451 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.28 to 0.9.29.
- [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.28...v0.9.29 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-02 14:38:16 +09:00
6024964b1e
Bump capybara from 3.16.0 to 3.16.1 ( #10450 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.0 to 3.16.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.16.0...3.16.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-02 14:34:37 +09:00
4444d8f9b3
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-30 12:36:24 +01:00
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
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
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
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
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
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
852ca12753
Bump bootsnap from 1.4.1 to 1.4.2 ( #10395 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.1 to 1.4.2.
- [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.1...v1.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-27 17:44:49 +01:00
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
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
0c1a05b281
Bump makara from 0.4.0 to 0.4.1 ( #10382 )
...
Bumps [makara]() from 0.4.0 to 0.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-26 12:53:11 +01:00
792a0f106e
Bump dotenv-rails from 2.7.1 to 2.7.2 ( #10381 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.7.1 to 2.7.2.
- [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.7.1...v2.7.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-26 18:37:04 +09:00
6968ae79a0
Bump nokogiri from 1.10.1 to 1.10.2 ( #10380 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.1 to 1.10.2.
- [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.1...v1.10.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-26 18:36:17 +09:00
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
035828f8c0
Bump rack-cors from 1.0.2 to 1.0.3 ( #10368 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.0.2 to 1.0.3.
- [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.0.2...v1.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-25 15:27:46 +01:00
013a9e0bed
Bump memory_profiler from 0.9.12 to 0.9.13 ( #10341 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.12 to 0.9.13.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases )
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.12...v0.9.13 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-22 22:43:22 +09:00
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
edd5441112
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-22 13:05:17 +01:00
d66bbdd353
Bump puma from 3.12.0 to 3.12.1 ( #10331 )
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.0 to 3.12.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/v3.12.0...v3.12.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-21 19:03:02 +09:00
4f91c8510f
Bump oj from 3.7.10 to 3.7.11 ( #10332 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.10 to 3.7.11.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.10...v3.7.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-21 19:02:48 +09:00
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
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
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
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
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
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
2bdb6dac28
Bump httplog from 1.2.1 to 1.2.2 ( #10311 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.2.1 to 1.2.2.
- [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 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-18 19:32:28 +09:00
14c6cbbf6b
Bump pkg-config from 1.3.6 to 1.3.7 ( #10310 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.6 to 1.3.7.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.6...1.3.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-18 19:32:10 +09:00
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
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
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
2e7b2b4da9
Bump oj from 3.7.9 to 3.7.10 ( #10278 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.9 to 3.7.10.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.9...v3.7.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-15 14:53:24 +01:00
07eb31eeac
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
2019-03-14 17:17:20 +01:00
dfb9efae81
[Security] Bump rails from 5.2.2 to 5.2.2.1 ( #10257 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.2 to 5.2.2.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-14 00:25:53 +01:00
02062aab55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
0a6840564a
Bump active_record_query_trace from 1.6.1 to 1.6.2 ( #10252 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.1...v1.6.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-13 14:57:02 +09:00
6a8dc59eb8
Bump concurrent-ruby from 1.1.4 to 1.1.5 ( #10242 )
...
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby ) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases )
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.4...v1.1.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-12 13:05:20 +01:00
f3e7634156
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-11 17:31:02 +01:00
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
a558ef45d8
Bump pkg-config from 1.3.5 to 1.3.6 ( #10235 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.5 to 1.3.6.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.5...1.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-11 21:31:16 +09:00
0a2e5abece
Bump active_record_query_trace from 1.6 to 1.6.1 ( #10237 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6 to 1.6.1.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6...v1.6.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-11 13:29:53 +01:00
674fe32f97
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 20:15:57 +01:00
9e33a71efa
Bump pkg-config from 1.3.4 to 1.3.5 ( #10218 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.4...1.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-08 19:16:55 +09:00
9c5e7805cc
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-07 13:24:30 +01:00
637c952ccb
Bump webpush from 0.3.6 to 0.3.7 ( #10205 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.6 to 0.3.7.
- [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.6...v0.3.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-07 20:38:10 +09:00
4806232997
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 11:29:06 +01:00
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
f513317ba2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- db/schema.rb
Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
5ecbf4d4c0
Bump sidekiq-unique-jobs from 6.0.11 to 6.0.12 ( #10132 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.11 to 6.0.12.
- [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/v6.0.11...v6.0.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-01 15:08:37 +09:00
2267eee356
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-28 21:35:53 +01:00
dependabot[bot]