about summary refs log tree commit diff
path: root/Gemfile.lock
AgeCommit message (Collapse)Author
2019-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`
2019-10-30Bump aws-sdk-s3 from 1.48.0 to 1.52.0 (#12250)dependabot-preview[bot]
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-30Bump annotate from 2.7.5 to 3.0.2 (#12100)dependabot-preview[bot]
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[Security] Bump simple_form from 4.1.0 to 5.0.1 (#12099)dependabot-preview[bot]
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-29Bump rspec-rails from 3.8.2 to 3.9.0 (#12241)dependabot-preview[bot]
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-29Bump strong_migrations from 0.4.1 to 0.4.2 (#12242)dependabot-preview[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.1 to 0.4.2. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.4.1...v0.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29Bump active_record_query_trace from 1.6.2 to 1.7 (#12243)dependabot-preview[bot]
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-28Bump pkg-config from 1.3.9 to 1.4.0 (#12239)dependabot-preview[bot]
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-28Bump faker from 2.5.0 to 2.6.0 (#12244)dependabot-preview[bot]
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-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-24[Security] Bump loofah from 2.2.3 to 2.3.1 (#12203)dependabot-preview[bot]
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1. **This update includes a security fix.** - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22Bump oj from 3.9.1 to 3.9.2 (#12104)dependabot-preview[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.9.1 to 3.9.2. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.9.1...v3.9.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22Bump stackprof from 0.2.12 to 0.2.13 (#12103)dependabot-preview[bot]
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.12 to 0.2.13. - [Release notes](https://github.com/tmm1/stackprof/releases) - [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md) - [Commits](https://github.com/tmm1/stackprof/compare/v0.2.12...v0.2.13) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22Bump sidekiq-unique-jobs from 6.0.13 to 6.0.15 (#12102)dependabot-preview[bot]
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.13 to 6.0.15. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.13...v6.0.15) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21Bump derailed_benchmarks from 1.4.0 to 1.4.1 (#12101)dependabot-preview[bot]
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/schneems/derailed_benchmarks/releases) - [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md) - [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.4.0...v1.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21Bump rubocop from 0.74.0 to 0.75.1 (#12191)dependabot-preview[bot]
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-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-04Merge tag 'v3.0.0' into glitch-soc/merge-upstreamThibaut Girka
2019-10-04Bump capistrano from 3.11.1 to 3.11.2 (#12012)dependabot-preview[bot]
* Bump capistrano from 3.11.1 to 3.11.2 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.11.1...v3.11.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump capistrano from 3.11.1 to 3.11.2
2019-10-04Bump pkg-config from 1.3.8 to 1.3.9 (#12011)dependabot-preview[bot]
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.3.8 to 1.3.9. - [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.8...1.3.9) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04Bump faker from 2.4.0 to 2.5.0 (#12010)dependabot-preview[bot]
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-04Bump tty-command from 0.8.2 to 0.9.0 (#12009)dependabot-preview[bot]
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-04Bump webmock from 3.7.5 to 3.7.6 (#12008)dependabot-preview[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.5 to 3.7.6. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.7.5...v3.7.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04Bump derailed_benchmarks from 1.3.6 to 1.4.0 (#12007)dependabot-preview[bot]
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.3.6 to 1.4.0. - [Release notes](https://github.com/schneems/derailed_benchmarks/releases) - [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md) - [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.3.6...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-03Bump patch level of Ruby (#12070)Daigo 3 Dango
Cosmetic change: patch level for the released 2.6.5 is p114.
2019-10-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-02Add parallelization to `tootctl search deploy` (#12051)Takeshi Umeda
* 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-02Use Ruby 2.6.5 (#12049)Daigo 3 Dango
2019-09-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
2019-09-25Use Ruby-2.6.4 (#11942)Daigo 3 Dango
2019-09-24Hide error message on /heath (#11947)Yamagishi Kazutoshi
* Hide error message on /heath * update health_check
2019-09-23Bump puma from 4.1.1 to 4.2.0 (#11939)dependabot-preview[bot]
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-23Bump doorkeeper from 5.2.0 to 5.2.1 (#11934)dependabot-preview[bot]
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.0 to 5.2.1. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.0...v5.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23Bump webmock from 3.7.3 to 3.7.5 (#11936)dependabot-preview[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.3 to 3.7.5. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.7.3...v3.7.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23Bump simplecov from 0.17.0 to 0.17.1 (#11932)dependabot-preview[bot]
Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.17.0 to 0.17.1. - [Release notes](https://github.com/colszowka/simplecov/releases) - [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md) - [Commits](https://github.com/colszowka/simplecov/compare/v0.17.0...v0.17.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23Bump chewy from 5.0.0 to 5.0.1 (#11935)dependabot-preview[bot]
Bumps [chewy](https://github.com/toptal/chewy) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/toptal/chewy/releases) - [Changelog](https://github.com/toptal/chewy/blob/master/CHANGELOG.md) - [Commits](https://github.com/toptal/chewy/compare/v5.0.0...v5.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23Bump redis from 4.1.2 to 4.1.3 (#11938)dependabot-preview[bot]
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.1.2...v4.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23Bump faker from 2.3.0 to 2.4.0 (#11933)dependabot-preview[bot]
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-20Bump doorkeeper from 5.1.0 to 5.2.0 (#11856)dependabot-preview[bot]
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-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
2019-09-16Bump capybara from 3.28.0 to 3.29.0 (#11854)dependabot-preview[bot]
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-16Bump webmock from 3.7.1 to 3.7.3 (#11853)dependabot-preview[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.1 to 3.7.3. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.7.1...v3.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16Bump tzinfo-data from 1.2019.2 to 1.2019.3 (#11857)dependabot-preview[bot]
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2019.2 to 1.2019.3. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.2...v1.2019.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16Bump faker from 2.2.2 to 2.3.0 (#11858)dependabot-preview[bot]
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-16Bump puma from 4.1.0 to 4.1.1 (#11855)dependabot-preview[bot]
Bumps [puma](https://github.com/puma/puma) from 4.1.0 to 4.1.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/v4.1.0...v4.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-14Revert "Bump webpush from 0.3.8 to 1.0.0 (#11614)" (#11840)Eugen Rochko
This reverts commit 9045f5e3f8aabcdff908058764882b7165a03925.
2019-09-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-10Change tootctl to use inline parallelization instead of Sidekiq (#11776)Eugen Rochko
- Remove --background option - Add --concurrency(=5) option - Add progress bars
2019-09-10Bump webpush from 0.3.8 to 1.0.0 (#11614)dependabot-preview[bot]
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.8 to 1.0.0. - [Release notes](https://github.com/zaru/webpush/releases) - [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md) - [Commits](https://github.com/zaru/webpush/compare/v0.3.8...v1.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09Bump fastimage from 2.1.5 to 2.1.7 (#11785)dependabot-preview[bot]
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.5 to 2.1.7. - [Release notes](https://github.com/sdsykes/fastimage/releases) - [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.5...v2.1.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
generated by cgit-pink (git 2.37.1) at 2024-11-01 19:50:04 +0000