about summary refs log tree commit diff
path: root/Gemfile
AgeCommit message (Collapse)Author
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-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-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 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-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-10-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-30Bump oj from 3.6.12 to 3.7.0 (#9155)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.6.12 to 3.7.0. - [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.6.12...v3.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30Bump i18n-tasks from master to 0.9.28 (#9148)Eugen Rochko
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-29Bump sanitize from 4.6.6 to 5.0.0 (#9140)Eugen Rochko
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
2018-10-29Update i18n-tasks to master (#9139)Eugen Rochko
2018-10-29Bump parallel_tests from 2.25.0 to 2.26.0 (#9137)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.25.0 to 2.26.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-29Bump rubocop from 0.59.2 to 0.60.0 (#9135)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.59.2 to 0.60.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.59.2...v0.60.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-28Update i18n-tasks and change CircleCI command (#9104)Eugen Rochko
* Update i18n-tasks and CircleCI command * Fix #9088 * Update i18n-tasks * Fix ast
2018-10-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
2018-10-25Bump parallel_tests from 2.24.0 to 2.25.0 (#9090)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.24.0 to 2.25.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.24.0...v2.25.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-25Bump aws-sdk-s3 from 1.21.0 to 1.23.0 (#9089)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.21.0 to 1.23.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-10-25Fix missing plural keys (#9084)Eugen Rochko
* Update i18n-tasks to feature-missing-plural-keys * Fix pluralizations with missing keys in Arabic Fix #8554 * Add i18n-tasks missing-plural-keys to CircleCI
2018-10-24Bump capybara from 3.9.0 to 3.10.0 (#9077)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.9.0 to 3.10.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.9.0...3.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-23Bump parallel_tests from 2.23.0 to 2.24.0 (#9064)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.23.0 to 2.24.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
2018-10-22Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049)Eugen Rochko
Fix #8889
2018-10-16Bump strong_migrations from 0.2.3 to 0.3.0 (#8991)dependabot[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.2.3 to 0.3.0. - [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.2.3...v0.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-12Bump pundit from 1.1.0 to 2.0.0 (#8873)dependabot[bot]
Bumps [pundit](https://github.com/varvet/pundit) from 1.1.0 to 2.0.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/compare/v1.1.0...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-11Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into ↵Thibaut Girka
glitch-soc/merge-upstream
2018-10-10Bump better_errors from 2.4.0 to 2.5.0 (#8946)dependabot[bot]
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js
2018-10-09Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936)dependabot[bot]
Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/capistrano/rails/releases) - [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-09Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934)dependabot[bot]
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.0. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-09Bump faker from 1.8.7 to 1.9.1 (#8935)dependabot[bot]
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1. - [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/v1.8.7...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08Bump capybara from 3.8.2 to 3.9.0 (#8924)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.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.8.2...3.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-08Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.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-10-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-06Remove unused ruby-progressbar dependency (#8896)Eugen Rochko
* Remove unused ruby-progressbar dependency * Remove unused colorize dependency
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-05Bump parallel_tests from 2.21.3 to 2.23.0 (#8884)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.21.3 to 2.23.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-05Bump puma from 3.11.4 to 3.12.0 (#8883)dependabot[bot]
Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.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/v3.11.4...v3.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
generated by cgit-pink (git 2.37.1) at 2024-12-18 13:43:14 +0000