about summary refs log tree commit diff
path: root/Gemfile.lock
AgeCommit message (Collapse)Author
2020-01-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.
2020-01-20Bump httplog from 1.3.3 to 1.4.0 (#12902)dependabot-preview[bot]
Bumps [httplog](https://github.com/trusche/httplog) from 1.3.3 to 1.4.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.3.3...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.
2020-01-20Bump parallel_tests from 2.30.0 to 2.30.1 (#12901)dependabot-preview[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.30.0 to 2.30.1. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.0...v2.30.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20Bump faker from 2.10.0 to 2.10.1 (#12899)dependabot-preview[bot]
Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.0 to 2.10.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/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20Bump capistrano-rbenv from 2.1.4 to 2.1.6 (#12898)dependabot-preview[bot]
Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv) from 2.1.4 to 2.1.6. - [Release notes](https://github.com/capistrano/rbenv/releases) - [Changelog](https://github.com/capistrano/rbenv/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/rbenv/compare/v2.1.4...v2.1.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20Bump webmock from 3.7.6 to 3.8.0 (#12900)dependabot-preview[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.6 to 3.8.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.7.6...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20Bump i18n-tasks from 0.9.29 to 0.9.30 (#12903)dependabot-preview[bot]
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.29 to 0.9.30. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.29...v0.9.30) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20Bump oj from 3.10.0 to 3.10.1 (#12897)dependabot-preview[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.10.0 to 3.10.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.10.0...v3.10.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-15Bump browser from 2.7.1 to 3.0.3 (#12850)dependabot-preview[bot]
Bumps [browser](https://github.com/fnando/browser) from 2.7.1 to 3.0.3. - [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.7.1...v3.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14Remove derailed_benchmarks dependency (#12861)Yamagishi Kazutoshi
2020-01-14Bump pg from 1.2.1 to 1.2.2 (#12854)dependabot-preview[bot]
Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.2.1...v1.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14Bump ox from 2.11.0 to 2.12.1 (#12853)dependabot-preview[bot]
Bumps [ox](https://github.com/ohler55/ox) from 2.11.0 to 2.12.1. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.11.0...v2.12.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 (#12852)dependabot-preview[bot]
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0. This release includes the previously tagged commit. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/e742697a0906e74e8bb777ef98137bc3955d981d...3.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14Bump rubocop from 0.78.0 to 0.79.0 (#12851)dependabot-preview[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.78.0 to 0.79.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.78.0...v0.79.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-01-13Bump rubocop-rails from 2.4.0 to 2.4.1 (#12780)dependabot-preview[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.0 to 2.4.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.4.0...v2.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one
2020-01-12Fix Ruby 2.7 support (#12831)ThibG
- update http gem to avoid errors - update blurhash gem to avoid shared object loading error - update goldfinger gem so the http gem could be updated - update json gem to avoid warnings
2020-01-12Remove ostatus2 gem from lockfile (#12826)mayaeh
2020-01-11Update lockfile for #12800 (#12825)mayaeh
2020-01-11Remove dependency on OStatus2 gem (#12822)ThibG
2020-01-11Bump rqrcode from 0.10.1 to 1.1.2 (#12357)dependabot-preview[bot]
Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 0.10.1 to 1.1.2. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Commits](https://github.com/whomwah/rqrcode/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-11Bump rdf-normalize from 0.3.3 to 0.4.0 (#12785)dependabot-preview[bot]
Bumps [rdf-normalize](https://github.com/gkellogg/rdf-normalize) from 0.3.3 to 0.4.0. - [Release notes](https://github.com/gkellogg/rdf-normalize/releases) - [Commits](https://github.com/gkellogg/rdf-normalize/compare/0.3.3...0.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-01-06Bump pg from 1.2.0 to 1.2.1 (#12783)dependabot-preview[bot]
Bumps [pg](https://github.com/ged/ruby-pg) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06Bump aws-sdk-s3 from 1.59.0 to 1.60.1 (#12784)dependabot-preview[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.59.0 to 1.60.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.59.0...v1.60.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06Bump bullet from 6.0.2 to 6.1.0 (#12782)dependabot-preview[bot]
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.2 to 6.1.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/6.0.2...6.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06Bump capybara from 3.29.0 to 3.30.0 (#12781)dependabot-preview[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.29.0 to 3.30.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.29.0...3.30.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-05Update lockfile for #12758 (#12762)mayaeh
2020-01-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.
2020-01-04Gemfile Updates - Others (#12761)Shlee
* Update Gemfile.lock * Update Gemfile * Update Gemfile.lock * Update Gemfile.lock * Update Gemfile * Update Gemfile.lock
2020-01-04Gemfile Updates - fixes warnings (#12759)Shlee
* Update Gemfile.lock * Update Gemfile.lock * Update Gemfile
2019-12-31Bump stackprof from 0.2.14 to 0.2.15 (#12726)dependabot-preview[bot]
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.14 to 0.2.15. - [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.14...v0.2.15) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31Bump pg from 1.1.4 to 1.2.0 (#12725)dependabot-preview[bot]
Bumps [pg](https://github.com/ged/ruby-pg) from 1.1.4 to 1.2.0. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31Bump redis-namespace from 1.6.0 to 1.7.0 (#12727)dependabot-preview[bot]
Bumps [redis-namespace](https://github.com/resque/redis-namespace) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/resque/redis-namespace/releases) - [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md) - [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31Bump faker from 2.9.0 to 2.10.0 (#12728)dependabot-preview[bot]
Bumps [faker](https://github.com/faker-ruby/faker) from 2.9.0 to 2.10.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.9.0...v2.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31Bump derailed_benchmarks from 1.4.2 to 1.4.3 (#12729)dependabot-preview[bot]
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.4.2 to 1.4.3. - [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.2...v1.4.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30Bump rack-cors from 1.1.0 to 1.1.1 (#12730)dependabot-preview[bot]
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.1.0 to 1.1.1. - [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.1.0...v1.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-29Circleci - Upgrade to Buster Images (#12705)Shlee
* Update config.yml * Update Gemfile.lock
2019-12-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `README.md` - `package.json`
2019-12-25Bump rubocop from 0.77.0 to 0.78.0 (#12677)dependabot-preview[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.77.0 to 0.78.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.77.0...v0.78.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-25Bump faker from 2.8.1 to 2.9.0 (#12680)dependabot-preview[bot]
Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.1 to 2.9.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.8.1...v2.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23Bump strong_migrations from 0.5.0 to 0.5.1 (#12679)dependabot-preview[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.0 to 0.5.1. - [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.5.0...v0.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23Bump rails from 5.2.4 to 5.2.4.1 (#12682)dependabot-preview[bot]
Bumps [rails](https://github.com/rails/rails) from 5.2.4 to 5.2.4.1. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4...v5.2.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23Bump rack-attack from 6.2.1 to 6.2.2 (#12681)dependabot-preview[bot]
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.2.1 to 6.2.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/v6.2.1...v6.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23Bump oj from 3.9.2 to 3.10.0 (#12683)dependabot-preview[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.9.2 to 3.10.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.9.2...v3.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-19Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc
2019-12-19[Security] Bump rack from 2.0.7 to 2.0.8 (#12654)dependabot-preview[bot]
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. **This update includes a security fix.** - [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.7...2.0.8) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18Bump rails from 5.2.3 to 5.2.4 (#12584)dependabot-preview[bot]
* Bump rails from 5.2.3 to 5.2.4 Bumps [rails](https://github.com/rails/rails) from 5.2.3 to 5.2.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * sprockets ~> 3.7