99f9579a04
Bump rubocop-rails from 2.3.2 to 2.4.0 ( #12532 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.2...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 22:56:53 +09:00
0a1824d0f0
Bump fabrication from 2.20.2 to 2.21.0 ( #12527 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.20.2 to 2.21.0.
- [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.2...2.21.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 22:55:43 +09:00
2b7158427f
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-30 17:29:44 +01:00
8040923501
Bump net-ldap from 0.16.1 to 0.16.2 ( #12479 )
...
Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap ) from 0.16.1 to 0.16.2.
- [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases )
- [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc )
- [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.1...v0.16.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 21:33:20 +09:00
c455a314fd
Bump parallel from 1.18.0 to 1.19.1 ( #12475 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.18.0 to 1.19.1.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.18.0...v1.19.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 20:49:19 +09:00
d4a2467c81
Bump rack-cors from 1.0.6 to 1.1.0 ( #12477 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.0.6 to 1.1.0.
- [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.6...v1.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:59:57 +09:00
19feb9b667
Bump charlock_holmes from 0.7.6 to 0.7.7 ( #12474 )
...
Bumps [charlock_holmes](https://github.com/brianmario/charlock_holmes ) from 0.7.6 to 0.7.7.
- [Release notes](https://github.com/brianmario/charlock_holmes/releases )
- [Commits](https://github.com/brianmario/charlock_holmes/compare/0.7.6...v0.7.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:53:50 +09:00
7c9cb9d7e8
Bump pghero from 2.3.0 to 2.4.1 ( #12478 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.3.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 09:03:02 +09:00
d52e27f3db
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-20 17:57:17 +01:00
5605b828e5
Bump webpacker from 4.0.7 to 4.2.0 ( #12416 )
...
* Bump webpacker from 4.0.7 to 4.2.0
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.0.7 to 4.2.0.
- [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.0.7...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Use NODE_ENV=tests instead of test, to work around async modules not having a chunk
2019-11-20 17:56:11 +01:00
ff67385cfb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
4e992e4ea8
Bump aws-sdk-s3 from 1.52.0 to 1.55.0 ( #12419 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.52.0 to 1.55.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.52.0...v1.55.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:40:16 +09:00
f2362f642a
Bump rack-attack from 6.1.0 to 6.2.1 ( #12421 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.1.0 to 6.2.1.
- [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.1.0...v6.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:26:08 +09:00
a3a109d12c
Bump parallel from 1.17.0 to 1.18.0 ( #12358 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.17.0...v1.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:43:43 +09:00
b0c4eb28e0
Bump rubocop from 0.75.1 to 0.76.0 ( #12355 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.75.1 to 0.76.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.75.1...v0.76.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:42:50 +09:00
6fa2f3eba3
Bump faker from 2.6.0 to 2.7.0 ( #12354 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.6.0 to 2.7.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.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:38:07 +09:00
e311131176
Bump stoplight from 2.1.3 to 2.2.0 ( #12360 )
...
Bumps [stoplight](https://github.com/orgsync/stoplight ) from 2.1.3 to 2.2.0.
- [Release notes](https://github.com/orgsync/stoplight/releases )
- [Changelog](https://github.com/orgsync/stoplight/blob/master/CHANGELOG.md )
- [Commits](https://github.com/orgsync/stoplight/compare/v2.1.3...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:34:48 +09:00
c6960938dd
Bump fuubar from 2.4.1 to 2.5.0 ( #12356 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.4.1 to 2.5.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.4.1...releases/v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:05:16 +09:00
05ae908d3f
[Security] Bump brakeman from 4.6.1 to 4.7.1 ( #12329 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.6.1 to 4.7.1. **This update includes a security fix.**
- [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.6.1...v4.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-08 14:45:42 +09:00
0ae7d84273
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
685b0db882
Bump aws-sdk-s3 from 1.48.0 to 1.52.0 ( #12250 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.48.0 to 1.52.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.48.0...v1.52.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:58:11 +09:00
741a85c064
Bump annotate from 2.7.5 to 3.0.2 ( #12100 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 2.7.5 to 3.0.2.
- [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.5...v3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:04:00 +09:00
0745fa8449
[Security] Bump simple_form from 4.1.0 to 5.0.1 ( #12099 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.1.0 to 5.0.1. **This update includes a security fix.**
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.1.0...v5.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:00:41 +09:00
291106e11c
Bump rspec-rails from 3.8.2 to 3.9.0 ( #12241 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 19:40:52 +09:00
0caa707726
Bump active_record_query_trace from 1.6.2 to 1.7 ( #12243 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6.2 to 1.7.
- [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.2...v1.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 10:55:07 +09:00
254ddfc08a
Bump pkg-config from 1.3.9 to 1.4.0 ( #12239 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.3.9 to 1.4.0.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.3.9...1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:48:08 +09:00
4ecfd4308d
Bump faker from 2.5.0 to 2.6.0 ( #12244 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.5.0 to 2.6.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.5.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:47:14 +09:00
41a98b6543
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
7840844919
Bump rubocop from 0.74.0 to 0.75.1 ( #12191 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.74.0 to 0.75.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.74.0...v0.75.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 23:43:49 +09:00
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
115c58e9a2
Bump faker from 2.4.0 to 2.5.0 ( #12010 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:21:56 +09:00
e320f240f6
Bump tty-command from 0.8.2 to 0.9.0 ( #12009 )
...
Bumps [tty-command](https://github.com/piotrmurach/tty-command ) from 0.8.2 to 0.9.0.
- [Release notes](https://github.com/piotrmurach/tty-command/releases )
- [Changelog](https://github.com/piotrmurach/tty-command/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-command/compare/v0.8.2...v0.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:19:54 +09:00
a84aedb7a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
0ce0baa9b5
Add parallelization to `tootctl search deploy` ( #12051 )
...
* Add parallel gem
* Modify parallel option in tootctl search deploy
* Add paralell option to tootctl search deploy
* Change 1 to false
* Clean up
* Rename --parallel to --processes
2019-10-02 21:50:43 +02:00
16ff7c5627
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
a5c558f052
Hide error message on /heath ( #11947 )
...
* Hide error message on /heath
* update health_check
2019-09-24 20:28:25 +02:00
1051c5cffa
Bump puma from 4.1.1 to 4.2.0 ( #11939 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 15:39:11 +02:00
3ff74cea72
Bump faker from 2.3.0 to 2.4.0 ( #11933 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.3.0...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:25:59 +09:00
92c2498554
Bump doorkeeper from 5.1.0 to 5.2.0 ( #11856 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.1.0...v5.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-20 02:19:12 +09:00
5cadb47238
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
576377a382
Bump capybara from 3.28.0 to 3.29.0 ( #11854 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.28.0 to 3.29.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.28.0...3.29.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 16:12:30 +02:00
b0148d4c05
Bump faker from 2.2.2 to 2.3.0 ( #11858 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.2 to 2.3.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.2...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 14:29:29 +02:00
74c5b2bd08
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
8674814825
Change tootctl to use inline parallelization instead of Sidekiq ( #11776 )
...
- Remove --background option
- Add --concurrency(=5) option
- Add progress bars
2019-09-10 13:48:48 +02:00
9aa2a5320e
Bump sanitize from 5.0.0 to 5.1.0 ( #11786 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.0.0...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:08:45 +09:00
5dcacde6a2
Bump mime-types from 3.2.2 to 3.3 ( #11788 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.2.2 to 3.3.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases )
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md )
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.2.2...v3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:03:07 +09:00
d7268befa8
Add healthcheck endpoint for web ( #11770 )
2019-09-07 02:47:51 +02:00
5088eb8388
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
529856a608
Bump addressable from 2.6.0 to 2.7.0 ( #11732 )
...
Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.6.0...addressable-2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 12:31:47 +09:00
80f86f290f
Bump aws-sdk-s3 from 1.46.0 to 1.48.0 ( #11729 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.46.0 to 1.48.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.46.0...v1.48.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:46:37 +09:00
e9dbb955a8
Bump faker from 2.1.2 to 2.2.1 ( #11733 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.2...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:44:01 +09:00
15d6a10c02
Bump webmock from 3.6.2 to 3.7.1 ( #11734 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.2 to 3.7.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.2...v3.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:42:35 +09:00
9044a2b051
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
2019-08-30 13:38:41 +02:00
18e37bee16
Fix JSON-LD deprecation warning in log output ( #11699 )
2019-08-30 01:34:21 +02:00
48b8a1f414
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb
All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
eb66af538a
Bump devise from 4.6.2 to 4.7.0 ( #11667 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.6.2 to 4.7.0.
- [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.6.2...v4.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 23:04:52 +09:00
282ea17078
Add soft delete for statuses for instant deletes through API ( #11623 )
...
* Add soft delete for statuses to allow them to appear instant
* Allow reporting soft-deleted statuses and show them in the admin UI
* Change index for getting an account's statuses
2019-08-22 21:55:56 +02:00
1488be7d96
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
92f60ba114
Bump simple-navigation from 4.0.5 to 4.1.0 ( #11617 )
...
Bumps [simple-navigation](https://github.com/codeplant/simple-navigation ) from 4.0.5 to 4.1.0.
- [Release notes](https://github.com/codeplant/simple-navigation/releases )
- [Changelog](https://github.com/codeplant/simple-navigation/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeplant/simple-navigation/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-20 01:49:17 +09:00
3dd0938369
Bump pghero from 2.2.1 to 2.3.0 ( #11615 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.2.1...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:37:22 +09:00
994bda37d5
Bump pundit from 2.0.1 to 2.1.0 ( #11613 )
...
Bumps [pundit](https://github.com/varvet/pundit ) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:36:45 +09:00
8578fe8014
Bump rubocop-rails from 2.2.1 to 2.3.0 ( #11612 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.2.1 to 2.3.0.
- [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.2.1...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:34:30 +09:00
eaf09997f0
Bump oj from 3.8.1 to 3.9.0 ( #11611 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.8.1 to 3.9.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.8.1...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:32:28 +09:00
c4ae7aab6f
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 16:24:22 +02:00
ccb2b6afb1
Bump devise-two-factor from 3.0.3 to 3.1.0 ( #11550 )
...
Bumps [devise-two-factor](https://github.com/tinfoil/devise-two-factor ) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/tinfoil/devise-two-factor/releases )
- [Changelog](https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tinfoil/devise-two-factor/compare/v3.0.3...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:11:55 +09:00
ff1333ff40
Bump puma from 4.0.1 to 4.1.0 ( #11548 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.0.1...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:11:18 +09:00
04534604c6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
82d2069c75
Bump faker from 1.9.6 to 2.1.0 and update faker api ( #11489 )
...
* Bump faker from 1.9.6 to 2.1.0
Bumps [faker](https://github.com/stympy/faker ) from 1.9.6 to 2.1.0.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/1.9.6...v2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Use faker api v2
https://github.com/stympy/faker/releases/tag/2.0
2019-08-06 15:33:03 +02:00
e50554391a
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-05 13:13:28 +02:00
6201bfdfba
Bump rubocop from 0.73.0 to 0.74.0 ( #11486 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.73.0 to 0.74.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.73.0...v0.74.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 18:53:30 +09:00
f88550a6cb
Bump capybara from 3.27.0 to 3.28.0 ( #11484 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.27.0 to 3.28.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.27.0...3.28.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 18:25:40 +09:00
24968d20a0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
658277b07e
let bundler fetch http_parser.rb submodules ( #11444 )
2019-07-29 20:42:04 +02:00
44ae763312
Bump capybara from 3.26.0 to 3.27.0 ( #11437 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.26.0 to 3.27.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.26.0...3.27.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 22:48:56 +09:00
dbb74ad351
Bump brakeman from 4.5.1 to 4.6.1 ( #11438 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.5.1 to 4.6.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.1...v4.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 22:37:02 +09:00
6aca7969c9
Bump aws-sdk-s3 from 1.45.0 to 1.46.0 ( #11439 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.45.0 to 1.46.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.45.0...v1.46.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 22:29:17 +09:00
bca3825c17
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
15de24a425
Bump json-ld-preloaded from 3.0.2 to 3.0.3 ( #11316 )
...
* Bump json-ld-preloaded from 3.0.2 to 3.0.3
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.2...3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* use json-ld edge
2019-07-28 13:48:43 +02:00
b9fbcbfe4e
Add search syntax for operators and phrases ( #11411 )
2019-07-27 04:42:08 +02:00
444796b69b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
05b8468755
Bump oj from 3.7.12 to 3.8.0 ( #11387 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.12 to 3.8.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.7.12...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 23:07:42 +09:00
e980e19a91
Bump rubocop from 0.72.0 to 0.73.0 ( #11384 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.72.0 to 0.73.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.72.0...v0.73.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 23:06:34 +09:00
b47e3b6cd8
Bump capybara from 3.25.0 to 3.26.0 ( #11385 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.25.0 to 3.26.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.25.0...3.26.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 23:04:17 +09:00
249991c498
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
3a6fe657ba
Bump rack-attack from 6.0.0 to 6.1.0 ( #11313 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.0.0 to 6.1.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/v6.0.0...v6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18 01:07:02 +02:00
7cc98eba28
Bump puma from 3.12.1 to 4.0.1 ( #11306 )
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.1 to 4.0.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.1...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18 01:06:14 +02:00
18d2eeeb38
Bump rubocop-rails from 2.0.1 to 2.2.0 ( #11257 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.0.1 to 2.2.0.
- [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.0.1...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
2f441876c7
Bump simplecov from 0.16.1 to 0.17.0 ( #11260 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.16.1 to 0.17.0.
- [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.16.1...v0.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
23978df143
Bump aws-sdk-s3 from 1.43.0 to 1.45.0 ( #11262 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.43.0 to 1.45.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.43.0...v1.45.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
6af0c955e1
Bump rubocop-rails from 2.0.1 to 2.2.0 ( #11257 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.0.1 to 2.2.0.
- [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.0.1...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-13 23:52:08 +09:00
6ff67be0f6
Add a spam check ( #11217 )
...
* Add a spam check
* Use Nilsimsa to generate locality-sensitive hashes and compare using Levenshtein distance
* Add more tests
* Add exemption when the message is a reply to something that mentions the sender
* Use Nilsimsa Compare Value instead of Levenshtein distance
* Use MD5 for messages shorter than 10 characters
* Add message to automated report, do not add non-public statuses to
automated report, add trust level to accounts and make unsilencing
raise the trust level to prevent repeated spam checks on that account
* Expire spam check data after 3 months
* Add support for local statuses, reduce expiration to 1 week, always create a report
* Add content warnings to the spam check and exempt empty statuses
* Change Nilsimsa threshold to 95 and make sure removed statuses are removed from the spam check
* Add all matched statuses into automatic report
2019-07-13 16:45:50 +02:00
d76ca8964c
Bump simplecov from 0.16.1 to 0.17.0 ( #11260 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.16.1 to 0.17.0.
- [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.16.1...v0.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-08 18:28:33 +09:00
01ee35f14a
Bump aws-sdk-s3 from 1.43.0 to 1.45.0 ( #11262 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.43.0 to 1.45.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.43.0...v1.45.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-08 18:26:41 +09:00
6ab84c12a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-04 16:21:39 +02:00
0d9ffe56fb
Add request pool to improve delivery performance ( #10353 )
...
* Add request pool to improve delivery performance
Fix #7909
* Ensure connection is closed when exception interrupts execution
* Remove Timeout#timeout from socket connection
* Fix infinite retrial loop on HTTP::ConnectionError
* Close sockets on failure, reduce idle time to 90 seconds
* Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server
* Use a shared pool size, 512 by default, to stay below open file limit
* Add some tests
* Add more tests
* Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds
* Use a shared pool that returns preferred connection but re-purposes other ones when needed
* Fix wrong connection being returned on subsequent calls within the same thread
* Reduce mutex calls on flushes from 2 to 1 and add test for reaping
2019-07-02 00:34:38 +02:00
13f54f41ad
Bump rubocop from 0.71.0 to 0.72.0 ( #11229 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.71.0 to 0.72.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.71.0...v0.72.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-01 22:36:45 +09:00
ffb6da8b78
Bump capybara from 3.24.0 to 3.25.0 ( #11225 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.24.0 to 3.25.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.24.0...3.25.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-01 22:34:51 +09:00
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
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
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
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
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
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
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
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
70423ce81f
require rubocop-rails in .rubocop.yml ( #10974 )
...
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965 )"
This reverts commit 121d19d7fa
2019-06-06 12:31:48 +02:00
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
121d19d7fa
Revert #10957 (rubocop-rails) which is incompatible with CodeClimate ( #10965 )
2019-06-04 19:35:19 +02:00
3e56f95c73
Replace from scss-lint to sass-lint ( #10958 )
2019-06-04 17:23:18 +02:00
3f536f06d6
Use rubocop-rails ( #10957 )
2019-06-04 15:25:52 +02:00
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
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
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
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-30 13:31:01 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +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
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
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
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
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
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
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
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
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
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
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
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
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
2267eee356
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-28 21:35:53 +01:00
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
0158937fc2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Dockerfile
Took upstream version and reverted f13ebd02c9
2019-02-26 17:04:44 +01:00
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
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
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
06cc04fd23
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-15 18:02:45 +01:00
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
0e34e91661
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-12 20:32:48 +01:00
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
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
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
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
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
04e2c67389
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-25 11:37:49 +01:00
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
5e0cf92fd1
Merge branch 'master' into glitch-soc/merge-upstream
...
No conflicts.
2019-01-19 18:28:37 +01:00
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
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
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
dbe311f0e9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/simple_form.pl.yml
2019-01-16 14:20:07 +01:00
ee5e24807f
Add `tootctl domains crawl` ( #9809 )
2019-01-15 09:24:35 +01:00
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
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
a2a64ecd3e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .eslintrc.yml
Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
Minor code cleanup when porting one of our features.
- app/models/account.rb
Note length validation has changed upstream.
We now use upstream's validation (dropped legacy glitch-soc
account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
Upstream has added support for scheduled toots, refactoring
the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
b418ef5ba8
Bump nokogiri from 1.9.1 to 1.10.0 ( #9757 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.9.1 to 1.10.0.
- [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.9.1...v1.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-08 14:10:30 +01:00
1c23124ba4
Bump rubocop from 0.61.1 to 0.62.0 ( #9702 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.61.1 to 0.62.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.61.1...v0.62.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-03 08:22:01 +01:00
dd43cbdf25
Bump httplog from 1.1.1 to 1.2.0 ( #9681 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.1.1 to 1.2.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.1.1...v1.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-02 22:39:02 +01:00
571d219bb9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
29484f6555
Replace Ruby 2.3 with 2.6 in CircleCI ( #9652 )
...
* Update config.yml
* Update Gemfile
* dropping ruby 2.3
2.3 EOL date: scheduled for 2019-03-31
* Updating docker containers
* Update Gemfile
2018-12-29 07:23:07 +01:00
17cd443b37
Bump webmock from 3.4.2 to 3.5.1 ( #9641 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.4.2 to 3.5.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.4.2...v3.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-27 12:23:27 +01:00
8be0843467
Bump cld3 from 3.2.2 to 3.2.3 ( #9632 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.2...v3.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-26 06:39:17 +01:00
034ffc079e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
Updated using upstream's code but using maxChars instead of the
hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
Upstream redesigned the onboarding modal. Not sure why we had a
conflict there.
2018-12-18 16:55:15 +01:00
071eb0e202
Bump nokogiri from 1.8.5 to 1.9.1 ( #9557 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.5 to 1.9.1.
- [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.8.5...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-18 16:41:41 +01:00
bfd0ebf925
Bump omniauth from 1.8.1 to 1.9.0 ( #9544 )
...
Bumps [omniauth](https://github.com/omniauth/omniauth ) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/omniauth/omniauth/releases )
- [Commits](https://github.com/omniauth/omniauth/compare/v1.8.1...v1.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-17 10:15:14 +01:00
65e994b29b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb
Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
2018-12-15 10:45:53 +01:00
fcc35f6ec1
Bump aws-sdk-s3 from 1.27.0 to 1.30.0 ( #9429 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.27.0 to 1.30.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/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-14 20:37:29 +01:00
7241db299c
Bump redis from 4.0.3 to 4.1.0 ( #9520 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.3 to 4.1.0.
- [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.0.3...v4.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-14 06:52:06 +01:00
a48fe52375
Bump letter_opener from 1.6.0 to 1.7.0 ( #9493 )
...
Bumps [letter_opener](https://github.com/ryanb/letter_opener ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases )
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-11 14:34:02 +09:00
f1041637ff
Bump json-ld-preloaded from 2.2.3 to 3.0.0 ( #9416 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 2.2.3 to 3.0.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/2.2.3...3.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-11 05:40:01 +01:00
1df392819d
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-06 12:44:38 +01:00
d5245434ec
Bump rails from 5.2.1.1 to 5.2.2 ( #9430 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.1.1 to 5.2.2.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 16:10:18 +09:00
c73c463478
Bump rubocop from 0.60.0 to 0.61.0 ( #9439 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.60.0 to 0.61.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.60.0...v0.61.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 16:08:54 +09:00
a61ce1c947
Bump capybara from 3.11.1 to 3.12.0 ( #9388 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.11.1 to 3.12.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.11.1...3.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04 09:27:17 +09:00
d32d33f408
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-02 20:29:14 +01:00
84e5ed43e7
Preload common JSON-LD contexts ( #9412 )
...
Fixes #9411
2018-12-02 16:46:13 +01:00
ad7a3974cc
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-29 19:22:52 +01:00
6fac300ea4
Bump aws-sdk-s3 from 1.25.0 to 1.27.0 ( #9385 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.25.0 to 1.27.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/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-28 16:34:53 +01:00
f8e07ca5cd
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
d5fac45f5b
Bump tty-prompt from 0.17.2 to 0.18.0 ( #9354 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.17.2 to 0.18.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.17.2...v0.18.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-27 12:27:00 +01:00
0206d569c3
Bump simple_form from 4.0.1 to 4.1.0 ( #9331 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.1...v4.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-23 14:29:59 +09:00
473998ca27
Bump sidekiq-bulk from 0.1.1 to 0.2.0 ( #9306 )
...
Bumps [sidekiq-bulk](https://github.com/aprescott/sidekiq-bulk ) from 0.1.1 to 0.2.0.
- [Release notes](https://github.com/aprescott/sidekiq-bulk/releases )
- [Changelog](https://github.com/aprescott/sidekiq-bulk/blob/master/CHANGES.md )
- [Commits](https://github.com/aprescott/sidekiq-bulk/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-22 12:47:36 +01:00
c100e82a56
Bump aws-sdk-s3 from 1.24.0 to 1.25.0 ( #9321 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.24.0 to 1.25.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/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-22 12:47:14 +01:00
367ad21995
Bump aws-sdk-s3 from 1.23.1 to 1.24.0 ( #9289 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.23.1 to 1.24.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/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-16 11:19:09 +01:00
96165a29ba
Bump capybara from 3.10.1 to 3.11.0 ( #9285 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.10.1 to 3.11.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.10.1...3.11.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-15 14:49:06 +09:00
bfe2b9cc50
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-13 16:28:07 +01:00
c81bdafb07
Bump parallel_tests from 2.26.2 to 2.27.0 ( #9263 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.26.2 to 2.27.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 12:50:48 +01:00
fe57d73e4c
Bump bullet from 5.8.1 to 5.9.0 ( #9264 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.8.1 to 5.9.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.8.1...5.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 12:49:51 +01:00
9201398507
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-09 14:56:31 +01:00
f055907857
Bump bullet from 5.7.6 to 5.8.1 ( #9156 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.6 to 5.8.1.
- [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.7.6...5.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08 21:15:33 +01:00
94ad76a5b9
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-30 11:22:25 +01:00
6771e8c88c
Bump oj from 3.6.12 to 3.7.0 ( #9155 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.12 to 3.7.0.
- [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.6.12...v3.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 06:39:52 +01:00
d4415cc316
Bump i18n-tasks from master to 0.9.28 ( #9148 )
2018-10-30 01:06:47 +01:00
f16d66c5c8
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-29 14:09:54 +01:00
b40ea6d1d4
Bump sanitize from 4.6.6 to 5.0.0 ( #9140 )
2018-10-29 14:05:25 +01:00
a942ad3062
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/simple_form.ja.yml
Not a real conflict, one new string was introduced in
glitch and one in upstream.
2018-10-29 14:00:41 +01:00
32f950a7a8
Update i18n-tasks to master ( #9139 )
2018-10-29 13:46:39 +01:00
ce33ce94c9
Bump parallel_tests from 2.25.0 to 2.26.0 ( #9137 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.25.0 to 2.26.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:55:55 +01:00
3b89abc343
Bump rubocop from 0.59.2 to 0.60.0 ( #9135 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.59.2 to 0.60.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.59.2...v0.60.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29 12:55:16 +01:00
b00f60f1d3
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-28 08:37:49 +01:00
26fe37c414
Update i18n-tasks and change CircleCI command ( #9104 )
...
* Update i18n-tasks and CircleCI command
* Fix #9088
* Update i18n-tasks
* Fix ast
2018-10-28 07:15:20 +01:00
5bb8563f6c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml
Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.
Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
2018-10-26 20:41:43 +02:00
98b4cdf198
Bump parallel_tests from 2.24.0 to 2.25.0 ( #9090 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.24.0 to 2.25.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.24.0...v2.25.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-25 08:29:25 +02:00
4e6cffe00c
Bump aws-sdk-s3 from 1.21.0 to 1.23.0 ( #9089 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.21.0 to 1.23.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/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-25 08:29:12 +02:00
df3a7e724d
Fix missing plural keys ( #9084 )
...
* Update i18n-tasks to feature-missing-plural-keys
* Fix pluralizations with missing keys in Arabic
Fix #8554
* Add i18n-tasks missing-plural-keys to CircleCI
2018-10-25 00:09:45 +02:00
9f3283086f
Bump capybara from 3.9.0 to 3.10.0 ( #9077 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.9.0 to 3.10.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.9.0...3.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-24 23:22:18 +09:00
8f3096b846
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-23 17:15:57 +02:00
dependabot-preview[bot]
Thibaut Girka
Takeshi Umeda
Yamagishi Kazutoshi
Eugen Rochko
Yusuke Nakamura
Milan
dependabot-preview[bot]
dependabot[bot]
ashleyhull-versent