741b53651e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
5 years ago
02fff98491
Fix JSON-LD deprecation warning in log output ( #11699 )
5 years ago
9cd6783781
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
b3141d0585
Revert bcrypt to 3.1.12, again ( #11693 )
...
Same reasons as in #11555
5 years ago
449a0727a7
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.
5 years ago
196ad08e2d
Bump bullet from 6.0.1 to 6.0.2 ( #11666 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.1...6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
244a0e61c0
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>
5 years ago
2a1e43dffc
Bump rubocop-rails from 2.3.0 to 2.3.1 ( #11665 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
32c781ec6b
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
5 years ago
c060523dc2
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
5 years ago
e849d13fba
Bump pkg-config from 1.3.7 to 1.3.8 ( #11616 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.7...1.3.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
07fbf5d1d8
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>
5 years ago
83e00255d2
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>
5 years ago
7b04ef05c3
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>
5 years ago
05588491a3
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>
5 years ago
eab02d822e
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>
5 years ago
8aba819ed2
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
c656426415
Revert bcrypt to 3.1.12 ( #11555 )
5 years ago
f0362fa0ee
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
b977373304
Bump parallel_tests from 2.29.1 to 2.29.2 ( #11549 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.1...v2.29.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e7188e0cce
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>
5 years ago
f07af657fa
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>
5 years ago
59d6720a90
Bump faker from 2.1.0 to 2.1.2 ( #11547 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.0...v2.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1fdf24925a
[Security] Bump nokogiri from 1.10.3 to 1.10.4 ( #11540 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ff76f6de4f
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
5 years ago
ed9245d6b2
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
5 years ago
77416866a7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
f5512700c1
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>
5 years ago
a77360aea1
Bump webmock from 3.6.0 to 3.6.2 ( #11488 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.0 to 3.6.2.
- [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.0...v3.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
44c1447b2b
Bump dotenv-rails from 2.7.4 to 2.7.5 ( #11487 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.4...v2.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a2d17b1fb3
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>
5 years ago
4973ba2d1f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
5 years ago
b9c4632db3
let bundler fetch http_parser.rb submodules ( #11444 )
5 years ago
ef5debb7a7
Bump oj from 3.8.0 to 3.8.1 ( #11435 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4de9652624
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>
5 years ago
569c7dfaed
Bump httplog from 1.3.1 to 1.3.2 ( #11436 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.3.1...v1.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ec28e1e11d
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>
5 years ago
1c59a60760
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>
5 years ago
6c7a3268c9
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
1cf7bdede4
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
5 years ago
9c617b3b3a
Add search syntax for operators and phrases ( #11411 )
5 years ago
124a1d3880
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
884e20c028
Bump active_model_serializers from 0.10.9 to 0.10.10 ( #11311 )
...
* Bump active_model_serializers from 0.10.9 to 0.10.10
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.9 to 0.10.10.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.10/CHANGELOG.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...v0.10.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Add root option to render method
5 years ago
579ccb0bb9
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
5 years ago
adbe5310fa
Bump browser from 2.5.3 to 2.6.1 ( #11388 )
...
Bumps [browser](https://github.com/fnando/browser ) from 2.5.3 to 2.6.1.
- [Release notes](https://github.com/fnando/browser/releases )
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/browser/compare/v2.5.3...v2.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c7f90215b1
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>
5 years ago
fe26f82cca
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>
5 years ago
43a34ed422
Bump premailer-rails from 1.10.2 to 1.10.3 ( #11386 )
...
Bumps [premailer-rails](https://github.com/fphilipe/premailer-rails ) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/fphilipe/premailer-rails/releases )
- [Changelog](https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fphilipe/premailer-rails/compare/v1.10.2...v1.10.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
179bb74f47
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>
5 years ago
eecce7e59b
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
5 years ago
Thibaut Girka
Eugen Rochko
dependabot-preview[bot]
Yusuke Nakamura
Milan