about summary refs log tree commit diff
path: root/Gemfile.lock
AgeCommit message (Collapse)Author
2018-12-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-14Bump aws-sdk-s3 from 1.27.0 to 1.30.0 (#9429)dependabot[bot]
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-14Bump redis from 4.0.3 to 4.1.0 (#9520)dependabot[bot]
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-11Bump letter_opener from 1.6.0 to 1.7.0 (#9493)dependabot[bot]
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-11Bump json-ld-preloaded from 2.2.3 to 3.0.0 (#9416)dependabot[bot]
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-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
2018-12-07Bump rubocop from 0.61.0 to 0.61.1 (#9451)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.0 to 0.61.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.61.0...v0.61.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-06Bump rails from 5.2.1.1 to 5.2.2 (#9430)dependabot[bot]
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-06Bump rails-controller-testing from 1.0.3 to 1.0.4 (#9440)dependabot[bot]
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/rails/rails-controller-testing/releases) - [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06Bump rubocop from 0.60.0 to 0.61.0 (#9439)dependabot[bot]
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-04Bump capybara from 3.11.1 to 3.12.0 (#9388)dependabot[bot]
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-04Bump rails-controller-testing from 1.0.2 to 1.0.3 (#9417)dependabot[bot]
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/rails/rails-controller-testing/releases) - [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04Bump pry-rails from 0.3.7 to 0.3.8 (#9418)dependabot[bot]
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.7 to 0.3.8. - [Release notes](https://github.com/rweng/pry-rails/releases) - [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-02Preload common JSON-LD contexts (#9412)ThibG
Fixes #9411
2018-11-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-30Bump oj from 3.7.1 to 3.7.4 (#9393)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.7.1 to 3.7.4. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.1...v3.7.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-30Bump fastimage from 2.1.4 to 2.1.5 (#9395)dependabot[bot]
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.4 to 2.1.5. - [Release notes](https://github.com/sdsykes/fastimage/releases) - [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-28Bump aws-sdk-s3 from 1.25.0 to 1.27.0 (#9385)dependabot[bot]
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-27[Security] Bump rails from 5.2.1 to 5.2.1.1 (#9383)dependabot[bot]
Bumps [rails](https://github.com/rails/rails) from 5.2.1 to 5.2.1.1. **This update includes security fixes.** - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.1...v5.2.1.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
2018-11-27Bump tty-prompt from 0.17.2 to 0.18.0 (#9354)dependabot[bot]
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-23Bump simple_form from 4.0.1 to 4.1.0 (#9331)dependabot[bot]
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-22Bump sidekiq-bulk from 0.1.1 to 0.2.0 (#9306)dependabot[bot]
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-22Bump aws-sdk-s3 from 1.24.0 to 1.25.0 (#9321)dependabot[bot]
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-22Bump capybara from 3.11.0 to 3.11.1 (#9305)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.0 to 3.11.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.11.0...3.11.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-16Bump aws-sdk-s3 from 1.23.1 to 1.24.0 (#9289)dependabot[bot]
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-15Bump capybara from 3.10.1 to 3.11.0 (#9285)dependabot[bot]
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-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-12Bump parallel_tests from 2.26.2 to 2.27.0 (#9263)dependabot[bot]
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-12Bump thor from 0.20.0 to 0.20.3 (#9266)dependabot[bot]
Bumps [thor](https://github.com/wycats/thor) from 0.20.0 to 0.20.3. - [Release notes](https://github.com/wycats/thor/releases) - [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md) - [Commits](https://github.com/wycats/thor/compare/v0.20.0...v0.20.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12Bump oj from 3.7.0 to 3.7.1 (#9265)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.0...v3.7.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12Bump bullet from 5.8.1 to 5.9.0 (#9264)dependabot[bot]
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-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-09Bump tty-prompt from 0.17.1 to 0.17.2 (#9243)dependabot[bot]
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.1 to 0.17.2. - [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.1...v0.17.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-09Bump sidekiq from 5.2.2 to 5.2.3 (#9241)dependabot[bot]
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.2 to 5.2.3. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.2...v5.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-09Bump pry-rails from 0.3.6 to 0.3.7 (#9242)dependabot[bot]
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/rweng/pry-rails/releases) - [Commits](https://github.com/rweng/pry-rails/compare/v0.3.6...v0.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-09Bump hiredis from 0.6.1 to 0.6.3 (#9240)dependabot[bot]
Bumps [hiredis](https://github.com/redis/hiredis-rb) from 0.6.1 to 0.6.3. - [Release notes](https://github.com/redis/hiredis-rb/releases) - [Changelog](https://github.com/redis/hiredis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/hiredis-rb/compare/v0.6.1...v0.6.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08Bump bullet from 5.7.6 to 5.8.1 (#9156)dependabot[bot]
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-08Bump parallel_tests from 2.26.0 to 2.26.2 (#9154)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.0 to 2.26.2. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.0...v2.26.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08Bump aws-sdk-s3 from 1.23.0 to 1.23.1 (#9174)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.0 to 1.23.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08Bump capybara from 3.10.0 to 3.10.1 (#9216)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.0 to 3.10.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.10.0...3.10.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08Bump pkg-config from 1.3.1 to 1.3.2 (#9215)dependabot[bot]
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.1...1.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-06[Security] Bump rack from 2.0.5 to 2.0.6 (#9214)dependabot[bot]
Bumps [rack](https://github.com/rack/rack) from 2.0.5 to 2.0.6. **This update includes security fixes.** - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.5...2.0.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05Bump active_model_serializers from 0.10.7 to 0.10.8 (#9209)dependabot[bot]
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.7 to 0.10.8. - [Release notes](https://github.com/rails-api/active_model_serializers/releases) - [Changelog](https://github.com/rails-api/active_model_serializers/blob/master/CHANGELOG-0-10.md) - [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...v0.10.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05Bump rack-attack from 5.4.1 to 5.4.2 (#9186)dependabot[bot]
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.1 to 5.4.2. - [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.1...v5.4.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-03Bump redis from 4.0.2 to 4.0.3 (#9187)dependabot[bot]
Bumps [redis](https://github.com/redis/redis-rb) from 4.0.2 to 4.0.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.0.2...v4.0.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
generated by cgit-pink (git 2.37.1) at 2024-11-19 09:06:39 +0000