about summary refs log tree commit diff
path: root/Gemfile
AgeCommit message (Collapse)Author
2021-03-01Bump webmock from 3.11.2 to 3.12.0 (#15817)dependabot[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.2 to 3.12.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.11.2...v3.12.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01Bump aws-sdk-s3 from 1.88.1 to 1.89.0 (#15814)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.88.1 to 1.89.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@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-24Bump doorkeeper from 5.4.0 to 5.5.0 (#15757)dependabot[bot]
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.4.0 to 5.5.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.4.0...v5.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-02-20Bump rails from 5.2.4.4 to 5.2.4.5 (#15729)dependabot[bot]
Bumps [rails](https://github.com/rails/rails) from 5.2.4.4 to 5.2.4.5. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4.4...v5.2.4.5) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20Bump puma from 5.1.1 to 5.2.1 (#15670)dependabot[bot]
Bumps [puma](https://github.com/puma/puma) from 5.1.1 to 5.2.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/v5.1.1...v5.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-19Bump simple_form from 5.0.3 to 5.1.0 (#15732)dependabot[bot]
Bumps [simple_form](https://github.com/plataformatec/simple_form) from 5.0.3 to 5.1.0. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.3...v5.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-19Bump faker from 2.15.1 to 2.16.0 (#15735)dependabot[bot]
Bumps [faker](https://github.com/faker-ruby/faker) from 2.15.1 to 2.16.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.15.1...v2.16.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.
2021-02-11Drop dependency on secure_headers, fix response headers (#15712)Claire
* Drop dependency on secure_headers, use always_write_cookie instead * Fix cookies in Tor Hidden Services by moving configuration to application.rb * Instead of setting always_write_cookie at boot, monkey-patch ActionDispatch
2021-02-11Downgrade bootsnap to 1.6.0 (#15711)Claire
* Revert "Bump bootsnap from 1.5.1 to 1.7.1 (#15669)" This reverts commit c3d1b7a2f5cf8e2f6b3490400b335024f0d34e12. * Downgrade bootsnap to 1.6.0
2021-02-12Bump rubocop from 1.8.1 to 1.9.1 (#15677)dependabot[bot]
* Bump rubocop from 1.8.1 to 1.9.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.8.1 to 1.9.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/v1.8.1...v1.9.1) Signed-off-by: dependabot[bot] <support@github.com> * Fix .codeclimate.yml Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-02-11Bump rack-attack from 6.4.0 to 6.5.0 (#15671)dependabot[bot]
Bumps [rack-attack](https://github.com/rack/rack-attack) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/rack/rack-attack/releases) - [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack-attack/compare/v6.4.0...v6.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-11Bump bootsnap from 1.5.1 to 1.7.1 (#15669)dependabot[bot]
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.5.1 to 1.7.1. - [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.5.1...v1.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-11Onion service related changes to HTTPS handling (#15560)Cecylia Bocovich
* Enable secure cookie flag for https only * Disable force_ssl for .onion hosts only Co-authored-by: Aiden McClelland <me@drbonez.dev>
2021-02-10Bump aws-sdk-s3 from 1.87.0 to 1.88.0 (#15667)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.87.0 to 1.88.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@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-02-02Bump capybara from 3.34.0 to 3.35.3 (#15649)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.34.0 to 3.35.3. - [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.34.0...3.35.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-02Bump chewy from 5.1.0 to 5.2.0 (#15648)dependabot[bot]
Bumps [chewy](https://github.com/toptal/chewy) from 5.1.0 to 5.2.0. - [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.1.0...v5.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-01Bump rubocop from 1.7.0 to 1.8.1 (#15573)dependabot[bot]
* Bump rubocop from 1.7.0 to 1.8.1 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.7.0 to 1.8.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/v1.7.0...v1.8.1) Signed-off-by: dependabot[bot] <support@github.com> * Fix .codeclimate.yml Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-01-26Bump thor from 1.0.1 to 1.1.0 (#15622)dependabot[bot]
Bumps [thor](https://github.com/erikhuda/thor) from 1.0.1 to 1.1.0. - [Release notes](https://github.com/erikhuda/thor/releases) - [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md) - [Commits](https://github.com/erikhuda/thor/compare/v1.0.1...v1.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26Bump tzinfo-data from 1.2020.6 to 1.2021.1 (#15623)dependabot[bot]
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.6 to 1.2021.1. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.6...v1.2021.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26Bump rack-attack from 6.3.1 to 6.4.0 (#15628)dependabot[bot]
Bumps [rack-attack](https://github.com/rack/rack-attack) from 6.3.1 to 6.4.0. - [Release notes](https://github.com/rack/rack-attack/releases) - [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/rack/rack-attack/compare/v6.3.1...v6.4.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.
2021-01-23Bump makara from 0.4.1 to 0.5.0 (#15578)dependabot[bot]
Bumps [makara](https://github.com/taskrabbit/makara) from 0.4.1 to 0.5.0. - [Release notes](https://github.com/taskrabbit/makara/releases) - [Changelog](https://github.com/instacart/makara/blob/master/CHANGELOG.md) - [Commits](https://github.com/taskrabbit/makara/compare/v0.4.1...v0.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-01-20Bump oj from 3.10.18 to 3.11.0 (#15583)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.10.18 to 3.11.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.10.18...v3.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-18Merge branch 'master' into glitch-soc/merge-upstreamClaire
2021-01-18Bump capistrano from 3.14.1 to 3.15.0 (#15537)dependabot[bot]
* Bump capistrano from 3.14.1 to 3.15.0 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.1 to 3.15.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.14.1...v3.15.0) Signed-off-by: dependabot[bot] <support@github.com> * Fix config/deploy.rb Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-01-11Merge branch 'master' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.
2021-01-07Bump binding_of_caller from 0.8.0 to 1.0.0 (#15489)dependabot[bot]
Bumps [binding_of_caller](https://github.com/banister/binding_of_caller) from 0.8.0 to 1.0.0. - [Release notes](https://github.com/banister/binding_of_caller/releases) - [Commits](https://github.com/banister/binding_of_caller/compare/v0.8.0...v1.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-06Merge branch 'master' into glitch-soc/merge-upstreamClaire
Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.
2021-01-05Bump nokogiri from 1.10.10 to 1.11.0 (#15487)dependabot[bot]
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.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.10.10...v1.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05Bump ruby-progressbar from 1.10.1 to 1.11.0 (#15491)dependabot[bot]
Bumps [ruby-progressbar](https://github.com/jfelchner/ruby-progressbar) from 1.10.1 to 1.11.0. - [Release notes](https://github.com/jfelchner/ruby-progressbar/releases) - [Changelog](https://github.com/jfelchner/ruby-progressbar/blob/master/CHANGELOG.md) - [Commits](https://github.com/jfelchner/ruby-progressbar/compare/releases/v1.10.1...releases/v1.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05Bump simplecov from 0.20.0 to 0.21.0 (#15485)dependabot[bot]
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.20.0 to 0.21.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.20.0...v0.21.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump cld3 from 3.3.0 to 3.4.1 (#15391)dependabot[bot]
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.3.0 to 3.4.1. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.3.0...v3.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump webmock from 3.10.0 to 3.11.0 (#15388)dependabot[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.10.0 to 3.11.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.10.0...v3.11.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump rubocop-rails from 2.8.1 to 2.9.1 (#15390)dependabot[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.1 to 2.9.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.8.1...v2.9.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump capybara from 3.33.0 to 3.34.0 (#15245)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.33.0 to 3.34.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.33.0...3.34.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump rubocop from 1.3.1 to 1.7.0 (#15447)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 1.3.1 to 1.7.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/v1.3.1...v1.7.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump rqrcode from 1.1.2 to 1.2.0 (#15450)dependabot[bot]
Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 1.1.2 to 1.2.0. - [Release notes](https://github.com/whomwah/rqrcode/releases) - [Commits](https://github.com/whomwah/rqrcode/commits/v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump aws-sdk-s3 from 1.85.0 to 1.87.0 (#15446)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.85.0 to 1.87.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@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump tty-prompt from 0.22.0 to 0.23.0 (#15400)dependabot[bot]
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.22.0 to 0.23.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.22.0...v0.23.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30Bump ox from 2.13.4 to 2.14.0 (#15396)dependabot[bot]
Bumps [ox](https://github.com/ohler55/ox) from 2.13.4 to 2.14.0. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.13.4...v2.14.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29Bump puma from 5.0.4 to 5.1.1 (#15339)dependabot[bot]
Bumps [puma](https://github.com/puma/puma) from 5.0.4 to 5.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/v5.0.4...v5.1.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29Bump simplecov from 0.19.1 to 0.20.0 (#15244)dependabot[bot]
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.19.1 to 0.20.0. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.19.1...v0.20.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29Bump net-ldap from 0.16.3 to 0.17.0 (#15242)dependabot[bot]
Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap) from 0.16.3 to 0.17.0. - [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.3...v0.17.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29Bump faker from 2.14.0 to 2.15.1 (#15239)dependabot[bot]
Bumps [faker](https://github.com/faker-ruby/faker) from 2.14.0 to 2.15.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.14.0...v2.15.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15Merge branch 'master' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.
2020-12-14Fix performance on instances list in admin UI (#15282)Eugen Rochko
- Reduce duplicate queries - Remove n+1 queries - Add accounts count to detailed view - Add separate action log entry for updating existing domain blocks
generated by cgit-pink (git 2.37.1) at 2024-07-03 13:12:53 +0000