about summary refs log tree commit diff
path: root/Gemfile
AgeCommit message (Collapse)Author
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-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-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 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 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-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-09Bump sanitize from 5.0.0 to 5.1.0 (#11786)dependabot-preview[bot]
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.0.0...v5.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09Bump mime-types from 3.2.2 to 3.3 (#11788)dependabot-preview[bot]
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.2.2 to 3.3. - [Release notes](https://github.com/mime-types/ruby-mime-types/releases) - [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md) - [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.2.2...v3.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-07Add healthcheck endpoint for web (#11770)Yamagishi Kazutoshi
2019-09-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-09-05Bump addressable from 2.6.0 to 2.7.0 (#11732)dependabot-preview[bot]
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.6.0...addressable-2.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05Bump aws-sdk-s3 from 1.46.0 to 1.48.0 (#11729)dependabot-preview[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.46.0 to 1.48.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.46.0...v1.48.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05Bump faker from 2.1.2 to 2.2.1 (#11733)dependabot-preview[bot]
Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.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.1.2...v2.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05Bump webmock from 3.6.2 to 3.7.1 (#11734)dependabot-preview[bot]
Bumps [webmock](https://github.com/bblimke/webmock) from 3.6.2 to 3.7.1. - [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.2...v3.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2019-08-30Fix JSON-LD deprecation warning in log output (#11699)Eugen Rochko
2019-08-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2019-08-26Bump devise from 4.6.2 to 4.7.0 (#11667)dependabot-preview[bot]
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>
2019-08-22Add soft delete for statuses for instant deletes through API (#11623)Eugen Rochko
* 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
2019-08-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2019-08-20Bump simple-navigation from 4.0.5 to 4.1.0 (#11617)dependabot-preview[bot]
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>
2019-08-19Bump pghero from 2.2.1 to 2.3.0 (#11615)dependabot-preview[bot]
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>
2019-08-19Bump pundit from 2.0.1 to 2.1.0 (#11613)dependabot-preview[bot]
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>
2019-08-19Bump rubocop-rails from 2.2.1 to 2.3.0 (#11612)dependabot-preview[bot]
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>
2019-08-19Bump oj from 3.8.1 to 3.9.0 (#11611)dependabot-preview[bot]
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>
2019-08-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-12Bump devise-two-factor from 3.0.3 to 3.1.0 (#11550)dependabot-preview[bot]
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>
2019-08-12Bump puma from 4.0.1 to 4.1.0 (#11548)dependabot-preview[bot]
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>
2019-08-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml
2019-08-06Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)Yusuke Nakamura
* 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
2019-08-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-05Bump rubocop from 0.73.0 to 0.74.0 (#11486)dependabot-preview[bot]
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>
2019-08-05Bump capybara from 3.27.0 to 3.28.0 (#11484)dependabot-preview[bot]
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>
2019-07-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
2019-07-29let bundler fetch http_parser.rb submodules (#11444)Milan
2019-07-29Bump capybara from 3.26.0 to 3.27.0 (#11437)dependabot-preview[bot]
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>
2019-07-29Bump brakeman from 4.5.1 to 4.6.1 (#11438)dependabot-preview[bot]
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>
2019-07-29Bump aws-sdk-s3 from 1.45.0 to 1.46.0 (#11439)dependabot-preview[bot]
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>
2019-07-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-07-28Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)dependabot-preview[bot]
* 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
2019-07-27Add search syntax for operators and phrases (#11411)Eugen Rochko
2019-07-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2019-07-22Bump oj from 3.7.12 to 3.8.0 (#11387)dependabot-preview[bot]
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>
2019-07-22Bump rubocop from 0.72.0 to 0.73.0 (#11384)dependabot-preview[bot]
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>
generated by cgit-pink (git 2.37.1) at 2024-07-03 07:25:11 +0000