d5f78355a8
Bump aws-partitions from 1.320.0 to 1.322.0 ( #13927 )
...
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.320.0 to 1.322.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
cb592b80aa
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
34e0a31a58
[Security] Bump kaminari from 1.2.0 to 1.2.1 ( #13886 )
...
Bumps [kaminari](https://github.com/kaminari/kaminari ) from 1.2.0 to 1.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/kaminari/kaminari/releases )
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kaminari/kaminari/compare/v1.2.0...v1.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
dcb3e180b9
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
8185f384dd
Bump rack-attack from 6.3.0 to 6.3.1 ( #13849 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.3.0 to 6.3.1.
- [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.3.0...v6.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
2540d34b5b
Bump rubocop from 0.83.0 to 0.84.0 ( #13843 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.83.0 to 0.84.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.83.0...v0.84.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
9484ccda0d
Bump sidekiq-unique-jobs from 6.0.21 to 6.0.22 ( #13845 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.21 to 6.0.22.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.21...v6.0.22 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
c8bc87482e
Bump aws-sdk-s3 from 1.64.0 to 1.66.0 ( #13847 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.64.0 to 1.66.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.64.0...v1.66.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
fbf47751df
Bump pghero from 2.4.2 to 2.5.0 ( #13848 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.4.2 to 2.5.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.4.2...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ccce394693
Bump rails from 5.2.4.2 to 5.2.4.3 ( #13844 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.4.2 to 5.2.4.3.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.4.2...v5.2.4.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
4a262cefeb
Bump puma from 4.3.3 to 4.3.5 ( #13823 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years ago
f867444d80
Bump capybara from 3.32.1 to 3.32.2 ( #13789 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.1 to 3.32.2.
- [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.32.1...3.32.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ea3296bd19
Bump aws-sdk-core from 3.95.0 to 3.96.1 ( #13818 )
...
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby ) from 3.95.0 to 3.96.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
38fbaa85a0
Bump rspec-rails from 4.0.0 to 4.0.1 ( #13788 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.0...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
b2f58bd27d
Bump brakeman from 4.8.1 to 4.8.2 ( #13796 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.8.1 to 4.8.2.
- [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.8.1...v4.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
b662f10b9f
Bump mime-types-data from 3.2020.0425 to 3.2020.0512 ( #13783 )
...
Bumps [mime-types-data](https://github.com/mime-types/mime-types-data ) from 3.2020.0425 to 3.2020.0512.
- [Release notes](https://github.com/mime-types/mime-types-data/releases )
- [Changelog](https://github.com/mime-types/mime-types-data/blob/master/History.md )
- [Commits](https://github.com/mime-types/mime-types-data/compare/v3.2020.0425...v3.2020.0512 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
0e3139cb53
Bump capistrano-rails from 1.4.0 to 1.5.0 ( #13794 )
...
Bumps [capistrano-rails](https://github.com/capistrano/rails ) from 1.4.0 to 1.5.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.4.0...v1.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
1449a653c1
Bump strong_migrations from 0.6.6 to 0.6.8 ( #13792 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.6.6 to 0.6.8.
- [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.6.6...v0.6.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
e7fce69c99
Bump minitest from 5.14.0 to 5.14.1 ( #13793 )
...
Bumps [minitest](https://github.com/seattlerb/minitest ) from 5.14.0 to 5.14.1.
- [Release notes](https://github.com/seattlerb/minitest/releases )
- [Changelog](https://github.com/seattlerb/minitest/blob/master/History.rdoc )
- [Commits](https://github.com/seattlerb/minitest/compare/v5.14.0...v5.14.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
84241863a2
Bump better_errors from 2.7.0 to 2.7.1 ( #13798 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.7.0...v2.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
835a33ebdb
Bump aws-partitions from 1.312.0 to 1.316.0 ( #13804 )
...
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.312.0 to 1.316.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
2ea95555e0
Bump rubocop from 0.82.0 to 0.83.0 ( #13806 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.82.0 to 0.83.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.82.0...v0.83.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
365ccfb96a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
0815d25543
Bump elasticsearch from 7.6.0 to 7.7.0 ( #13784 )
...
Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby ) from 7.6.0 to 7.7.0.
- [Release notes](https://github.com/elastic/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/elastic/elasticsearch-ruby/compare/v7.6.0...7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
4853a87df8
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
e7e09d3b7b
Bump doorkeeper from 5.3.3 to 5.4.0 ( #13733 )
...
* Bump doorkeeper from 5.3.3 to 5.4.0
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.3.3 to 5.4.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.3.3...v5.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Fix tests
* Fix use of Doorkeeper::AccessToken.find_or_create_for
* Fix tests?
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
0d051c3b46
Bump public_suffix from 4.0.4 to 4.0.5 ( #13736 )
...
Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby ) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases )
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v4.0.4...v4.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
a870e9e9a5
Bump raabro from 1.1.6 to 1.3.1 ( #13738 )
...
Bumps [raabro](https://github.com/floraison/raabro ) from 1.1.6 to 1.3.1.
- [Release notes](https://github.com/floraison/raabro/releases )
- [Changelog](https://github.com/floraison/raabro/blob/master/CHANGELOG.md )
- [Commits](https://github.com/floraison/raabro/compare/v1.1.6...v1.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
1d36eafbca
Bump browser from 4.0.0 to 4.1.0 ( #13737 )
...
Bumps [browser](https://github.com/fnando/browser ) from 4.0.0 to 4.1.0.
- [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/v4.0.0...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
1932b58e73
Bump aws-partitions from 1.311.0 to 1.312.0 ( #13735 )
...
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.311.0 to 1.312.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
6c7335268a
Bump strong_migrations from 0.6.5 to 0.6.6 ( #13731 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.6.5 to 0.6.6.
- [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.6.5...v0.6.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
a30288e823
Bump rspec-expectations from 3.9.1 to 3.9.2 ( #13734 )
...
Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations ) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/rspec/rspec-expectations/releases )
- [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.1...v3.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
05dcfe63cb
Bump pastel from 0.7.3 to 0.7.4 ( #13732 )
...
Bumps [pastel](https://github.com/piotrmurach/pastel ) from 0.7.3 to 0.7.4.
- [Release notes](https://github.com/piotrmurach/pastel/releases )
- [Changelog](https://github.com/piotrmurach/pastel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/pastel/compare/v0.7.3...v0.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
4e4e5316c1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, just a glitch-soc-only dependency too close to a
dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
Not a real conflict, just a change too close to glitch-soc-changed code
for optionally showing boosts in public timelines.
Applied upstream changes.
- `app/views/layouts/application.html.haml`:
Upstream a new, static CSS file, conflict due to glitch-soc's theming
system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
both files are very different. Removed 'unsafe-inline' as well.
5 years ago
47b2a45794
Bump mimemagic from 0.3.4 to 0.3.5 ( #13654 )
...
Bumps [mimemagic](https://github.com/minad/mimemagic ) from 0.3.4 to 0.3.5.
- [Release notes](https://github.com/minad/mimemagic/releases )
- [Changelog](https://github.com/minad/mimemagic/blob/master/CHANGELOG.md )
- [Commits](https://github.com/minad/mimemagic/compare/v0.3.4...v0.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
139c853aac
Bump capistrano from 3.13.0 to 3.14.0 ( #13624 )
...
* Bump capistrano from 3.13.0 to 3.14.0
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.13.0...v3.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Update deploy.rb
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
5 years ago
9c5306bfcf
Bump rubocop from 0.79.0 to 0.82.0 ( #13677 )
...
* Bump rubocop from 0.79.0 to 0.82.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.79.0 to 0.82.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.79.0...v0.82.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Update .codeclimate.yml
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
5 years ago
5676525014
Bump net-scp from 2.0.0 to 3.0.0 ( #13601 )
...
Bumps [net-scp](https://github.com/net-ssh/net-scp ) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/net-ssh/net-scp/releases )
- [Changelog](https://github.com/net-ssh/net-scp/blob/master/CHANGES.txt )
- [Commits](https://github.com/net-ssh/net-scp/compare/v2.0.0...v3.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
c4b78c07e3
Bump pry-byebug from 3.8.0 to 3.9.0 ( #13653 )
...
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug ) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.8.0...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
c1e1b1f860
Bump parser from 2.7.1.1 to 2.7.1.2 ( #13618 )
...
Bumps [parser](https://github.com/whitequark/parser ) from 2.7.1.1 to 2.7.1.2.
- [Release notes](https://github.com/whitequark/parser/releases )
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.1...v2.7.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
f8330c501b
Bump capybara from 3.31.0 to 3.32.1 ( #13641 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.31.0 to 3.32.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.31.0...3.32.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ce448c1850
Bump fugit from 1.3.3 to 1.3.5 ( #13634 )
...
Bumps [fugit](https://github.com/floraison/fugit ) from 1.3.3 to 1.3.5.
- [Release notes](https://github.com/floraison/fugit/releases )
- [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/floraison/fugit/compare/v1.3.3...v1.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
cb125a9b16
Bump byebug from 11.1.1 to 11.1.3 ( #13625 )
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.1.1 to 11.1.3.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.1...v11.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
aa95acd357
Bump tzinfo-data from 1.2019.3 to 1.2020.1 ( #13645 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2019.3 to 1.2020.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.3...v1.2020.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
91d6a7ce96
Bump launchy from 2.4.3 to 2.5.0 ( #13628 )
...
Bumps [launchy](https://github.com/copiousfreetime/launchy ) from 2.4.3 to 2.5.0.
- [Release notes](https://github.com/copiousfreetime/launchy/releases )
- [Changelog](https://github.com/copiousfreetime/launchy/blob/master/README.md )
- [Commits](https://github.com/copiousfreetime/launchy/compare/v2.4.3...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
708472ef3c
Bump pry from 0.12.2 to 0.13.1 ( #13626 )
...
Bumps [pry](https://github.com/pry/pry ) from 0.12.2 to 0.13.1.
- [Release notes](https://github.com/pry/pry/releases )
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md )
- [Commits](https://github.com/pry/pry/compare/v0.12.2...v0.13.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
aa798c7b80
Bump better_errors from 2.6.0 to 2.7.0 ( #13663 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3f07b08189
Bump rspec-core from 3.9.1 to 3.9.2 ( #13602 )
...
Bumps [rspec-core](https://github.com/rspec/rspec-core ) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/rspec/rspec-core/releases )
- [Changelog](https://github.com/rspec/rspec-core/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-core/compare/v3.9.1...v3.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
dad72b47d3
Bump redis-activesupport from 5.0.4 to 5.2.0 ( #13599 )
...
Bumps [redis-activesupport](http://redis-store.org/redis-activesupport ) from 5.0.4 to 5.2.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
33d85a6333
Bump aws-sdk-s3 from 1.63.0 to 1.64.0 ( #13675 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.63.0 to 1.64.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.63.0...v1.64.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
e90aad7473
Bump sidekiq from 6.0.4 to 6.0.7 ( #13630 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.4 to 6.0.7.
- [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/v6.0.4...v6.0.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
6a2dafcefc
Bump json-ld from 3.1.3 to 3.1.4 ( #13661 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.3...3.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
8316edeb00
Bump jwt from 2.1.0 to 2.2.1 ( #13639 )
...
Bumps [jwt](https://github.com/jwt/ruby-jwt ) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/jwt/ruby-jwt/releases )
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.1.0...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
150708a524
Bump http from 4.3.0 to 4.4.1 ( #13598 )
...
Bumps [http](https://github.com/httprb/http ) from 4.3.0 to 4.4.1.
- [Release notes](https://github.com/httprb/http/releases )
- [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md )
- [Commits](https://github.com/httprb/http/compare/v4.3.0...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
07d55e7c2e
Bump webpacker from 4.2.2 to 5.1.1 ( #13631 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.2.2 to 5.1.1.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v4.2.2...v5.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
db57a58c76
Bump redis from 4.1.3 to 4.1.4 ( #13636 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.1.3 to 4.1.4.
- [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.1.3...v4.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
a223cffd3c
Bump rack-attack from 6.2.2 to 6.3.0 ( #13657 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.2.2 to 6.3.0.
- [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.2...v6.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
9e6c30d071
Bump strong_migrations from 0.6.2 to 0.6.5 ( #13649 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.6.2 to 0.6.5.
- [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.6.2...v0.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
5179050da5
Bump brakeman from 4.8.0 to 4.8.1 ( #13652 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.8.0 to 4.8.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.8.0...v4.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ed45f38191
Bump premailer-rails from 1.10.3 to 1.11.1 ( #13620 )
...
Bumps [premailer-rails](https://github.com/fphilipe/premailer-rails ) from 1.10.3 to 1.11.1.
- [Release notes](https://github.com/fphilipe/premailer-rails/releases )
- [Changelog](https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fphilipe/premailer-rails/compare/v1.10.3...v1.11.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
edb62caf3c
Bump doorkeeper from 5.3.2 to 5.3.3 ( #13673 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.3.2 to 5.3.3.
- [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/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
784cfba5d0
Bump pghero from 2.4.1 to 2.4.2 ( #13603 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.4.1 to 2.4.2.
- [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.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
0adc43012d
[Security] Bump doorkeeper from 5.3.1 to 5.3.2 ( #13613 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.3.1 to 5.3.2. **This update includes a security fix.**
- [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/v.5.3.1...v5.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
231e876fd0
Bump kaminari from 1.1.1 to 1.2.0 ( #13596 )
...
Bumps [kaminari](https://github.com/kaminari/kaminari ) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/kaminari/kaminari/releases )
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kaminari/kaminari/compare/v1.1.1...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
dfa13deaa1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/statuses_controller.rb`:
Upstream disabled the embed controller for reblogs.
Not a real conflict, but glitch-soc has an extra line to deal
with its theming system.
Ported upstream changes.
- `app/javascript/packs/public.js`:
Upstream made changes to get rid of most inline CSS, this changes
javascript for public pages, which in glitch are split between
different files. Ported those changes.
- `app/models/status.rb`:
Upstream changed the block check in `Status#permitted_for` to
include domain-block checks. Not a real conflict with glitch-soc,
but our scope is slightly different, as our scope for
unauthenticated access do not include instance-local toots.
Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
Not a real conflict, upstream added a new field to the instance
serializer, the conflict is one line above since we added more of
that.
Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
Upstream got rid of most inline CSS and moved hidden elements
to data attributes in the process, in fields were we have
different values.
Ported upstream changes while keeping our glitch-specific
values.
- `app/views/statuses/_simple_status.html.haml`:
Upstream got rid of inline CSS on an HAML line we treat
differently, stripping empty text nodes.
Ported upstream changes to the style attribute, keeping
the empty text node stripping behavior.
5 years ago
9db780b0d4
Change CircleCI test output ( #13587 )
5 years ago
1ddf4ed6bf
Bump parslet from 1.8.2 to 2.0.0 ( #13564 )
...
Bumps [parslet](https://github.com/kschiess/parslet ) from 1.8.2 to 2.0.0.
- [Release notes](https://github.com/kschiess/parslet/releases )
- [Changelog](https://github.com/kschiess/parslet/blob/master/HISTORY.txt )
- [Commits](https://github.com/kschiess/parslet/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
dfae78960e
Bump json-ld from 3.1.2 to 3.1.3 ( #13566 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.2...3.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ff9179ab0c
Bump ruby-saml from 1.9.0 to 1.11.0 ( #13559 )
...
Bumps [ruby-saml](https://github.com/onelogin/ruby-saml ) from 1.9.0 to 1.11.0.
- [Release notes](https://github.com/onelogin/ruby-saml/releases )
- [Changelog](https://github.com/onelogin/ruby-saml/blob/master/changelog.md )
- [Commits](https://github.com/onelogin/ruby-saml/compare/v1.9.0...v1.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3869798e81
Bump mime-types-data from 3.2019.1009 to 3.2020.0425 ( #13554 )
...
Bumps [mime-types-data](https://github.com/mime-types/mime-types-data ) from 3.2019.1009 to 3.2020.0425.
- [Release notes](https://github.com/mime-types/mime-types-data/releases )
- [Changelog](https://github.com/mime-types/mime-types-data/blob/master/History.md )
- [Commits](https://github.com/mime-types/mime-types-data/compare/v3.2019.1009...v3.2020.0425 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
451b3fd846
Bump http-form_data from 2.2.0 to 2.3.0 ( #13560 )
...
Bumps [http-form_data](https://github.com/httprb/form_data.rb ) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/httprb/form_data.rb/releases )
- [Changelog](https://github.com/httprb/form_data/blob/master/CHANGES.md )
- [Commits](https://github.com/httprb/form_data.rb/compare/v2.2.0...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
0dc372314d
Bump aws-sdk-s3 from 1.61.2 to 1.63.0 ( #13562 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.61.2 to 1.63.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/v1.63.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
9733f7cfcc
Bump aws-partitions from 1.296.0 to 1.303.0 ( #13552 )
...
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.296.0 to 1.303.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
475d0375ec
Bump oj from 3.10.5 to 3.10.6 ( #13557 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.5 to 3.10.6.
- [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.5...v3.10.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
2ac1f38bd8
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
18646e4792
Bump parser from 2.7.1.0 to 2.7.1.1 ( #13508 )
...
Bumps [parser](https://github.com/whitequark/parser ) from 2.7.1.0 to 2.7.1.1.
- [Release notes](https://github.com/whitequark/parser/releases )
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.0...v2.7.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
2b8cce6b52
Bump redis-actionpack from 5.0.2 to 5.2.0 ( #13510 )
...
Bumps [redis-actionpack](http://redis-store.org/redis-actionpack ) from 5.0.2 to 5.2.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
4c125214de
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
32393c90c0
Bump nokogumbo from 2.0.1 to 2.0.2 ( #13509 )
...
Bumps [nokogumbo](https://github.com/rubys/nokogumbo ) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/rubys/nokogumbo/releases )
- [Changelog](https://github.com/rubys/nokogumbo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubys/nokogumbo/compare/v2.0.1...v2.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
0a48b2a262
Bump excon from 0.71.0 to 0.73.0 ( #13507 )
...
Bumps [excon](https://github.com/excon/excon ) from 0.71.0 to 0.73.0.
- [Release notes](https://github.com/excon/excon/releases )
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt )
- [Commits](https://github.com/excon/excon/compare/v0.71.0...v0.73.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3c4da0e5d0
Bump redis-rack from 2.0.4 to 2.1.2 ( #13512 )
...
Bumps [redis-rack](http://redis-store.org/redis-rack ) from 2.0.4 to 2.1.2.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
8cfe3a4e9b
Bump rqrcode_core from 0.1.1 to 0.1.2 ( #13506 )
...
Bumps [rqrcode_core](https://github.com/whomwah/rqrcode_core ) from 0.1.1 to 0.1.2.
- [Release notes](https://github.com/whomwah/rqrcode_core/releases )
- [Commits](https://github.com/whomwah/rqrcode_core/commits/v0.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
cf1286761a
Bump aws-sigv4 from 1.1.1 to 1.1.2 ( #13513 )
...
Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby ) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.1...1.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
f9d5864e04
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
No real conflict, upstream updated a dependency which is
textually adjacent to a glitch-soc-specific dependency.
Updated it.
- `yarn.lock`:
No real conflict, upstream updated a dependency which is
textually adjacent to a glitch-soc-specific dependency.
Updated it.
5 years ago
54fb8967cd
Bump regexp_parser from 1.6.0 to 1.7.0 ( #13460 )
...
Bumps [regexp_parser](https://github.com/ammar/regexp_parser ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ammar/regexp_parser/releases )
- [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ammar/regexp_parser/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
34d4ff13a6
Bump rubocop-rails from 2.4.2 to 2.5.2 ( #13459 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.2.
- [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.2...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
d5002774dd
Bump capistrano from 3.12.1 to 3.13.0 ( #13455 )
...
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.12.1 to 3.13.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.12.1...v3.13.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
1698ba611e
Bump elasticsearch from 7.5.0 to 7.6.0 ( #13458 )
...
Bumps [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby ) from 7.5.0 to 7.6.0.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/v7.6.0/CHANGELOG.md )
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v7.5.0...v7.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
82d4934e21
Bump fabrication from 2.21.0 to 2.21.1 ( #13453 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.21.0 to 2.21.1.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/compare/2.21.0...2.21.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
abc78ebcea
Bump aws-sdk-s3 from 1.61.1 to 1.61.2 ( #13456 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.61.1 to 1.61.2.
- [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-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
2f49575839
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
We have a different README than upstream, discarded upstream changes
and kept ours.
5 years ago
c6fed2d4d5
Bump capistrano-bundler from 1.3.0 to 1.6.0 ( #13416 )
...
Bumps [capistrano-bundler](https://github.com/capistrano/bundler ) from 1.3.0 to 1.6.0.
- [Release notes](https://github.com/capistrano/bundler/releases )
- [Changelog](https://github.com/capistrano/bundler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/bundler/compare/v1.3.0...v1.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ea695d95cd
Bump elasticsearch-dsl from 0.1.8 to 0.1.9 ( #13419 )
...
Bumps [elasticsearch-dsl](https://github.com/elasticsearch/elasticsearch-ruby ) from 0.1.8 to 0.1.9.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v0.1.8...v0.1.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
fe3d5bfc43
Bump annotate from 3.0.3 to 3.1.1 ( #13417 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.0.3 to 3.1.1.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.3...v3.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
d92f88398d
Bump public_suffix from 4.0.3 to 4.0.4 ( #13418 )
...
Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby ) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases )
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/4.0.3...v4.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
23285456fb
Bump bcrypt from 3.1.12 to 3.1.13 ( #13420 )
...
Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby ) from 3.1.12 to 3.1.13.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases )
- [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG )
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.12...v3.1.13 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
6986543aca
Bump loofah from 2.4.0 to 2.5.0 ( #13422 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
c13682bc0d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream modified code that we split between multiple files due
to glitch-soc's theming system.
Ported those changes.
5 years ago
aa18f4e7d1
Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 ( #13387 )
...
* Bump rails from 5.2.4.1 to 5.2.4.2
* Bump kind-of from 6.0.2 to 6.0.3
5 years ago
631dacf1d7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
Upstream bumped poll option character limit, but we already had
a higher one, kept ours.
- `app/validators/poll_validator.rb`:
Upstream bumped poll option character limit, but we already had
a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
Upstream added a rule, the way we compute ours is different, but
that added rule has been ported.
- `package.json`:
No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
No real conflict, dependency update. Performed the same update.
5 years ago
37e867d3f2
Bump rspec-rails from 3.9.1 to 4.0.0 ( #13364 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
61a3db761e
Bump json-ld from 3.1.1 to 3.1.2 ( #13368 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.1...3.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
cf2f9e48f5
Bump json-ld-preloaded from 3.1.1 to 3.1.2 ( #13365 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.1...3.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
53438a329f
Bump bootsnap from 1.4.5 to 1.4.6 ( #13369 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.5 to 1.4.6.
- [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.4.5...v1.4.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
186c25dc7a
Bump tty-prompt from 0.20.0 to 0.21.0 ( #13366 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.20.0 to 0.21.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.20.0...v0.21.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
4add5dd7ff
Bump faker from 2.10.1 to 2.11.0 ( #13363 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.1 to 2.11.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/commits/v2.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
a10a1389f7
Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 ( #13367 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.20 to 6.0.21.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...v6.0.21 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
5607fae147
Bump concurrent-ruby from 1.1.5 to 1.1.6 ( #13346 )
...
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby ) from 1.1.5 to 1.1.6.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases )
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.5...v1.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
28b80460f1
Bump parallel_tests from 2.30.1 to 2.32.0 ( #13341 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.30.1 to 2.32.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.1...v2.32.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
a6f9f5aaaa
Bump better_errors from 2.5.1 to 2.6.0 ( #13340 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
31057178a7
Bump ox from 2.12.1 to 2.13.2 ( #13342 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.12.1 to 2.13.2.
- [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.12.1...v2.13.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
8b0500e8b0
Bump iso-639 from 0.2.8 to 0.3.5 ( #13343 )
...
Bumps [iso-639](https://github.com/xwmx/iso-639 ) from 0.2.8 to 0.3.5.
- [Release notes](https://github.com/xwmx/iso-639/releases )
- [Commits](https://github.com/xwmx/iso-639/compare/0.2.8...0.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
d5046055c3
Bump oj from 3.10.3 to 3.10.5 ( #13345 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.3 to 3.10.5.
- [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.3...v3.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
7186329a38
Bump pg from 1.2.2 to 1.2.3 ( #13344 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.2.2 to 1.2.3.
- [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.2...v1.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
8e4eaaf71e
Bump brakeman from 4.7.2 to 4.8.0 ( #13309 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.7.2 to 4.8.0.
- [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.7.2...v4.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3788f37c30
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
CW/sensitive logic fixed upstream, but different in glitch-soc.
Ported the changes accordingly.
5 years ago
09372c64d0
Bump aws-sdk-s3 from 1.60.1 to 1.61.1 ( #13306 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.60.1 to 1.61.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-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
b6ed06331e
Bump discard from 1.1.0 to 1.2.0 ( #13308 )
...
Bumps [discard](https://github.com/jhawthorn/discard ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases )
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jhawthorn/discard/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ef98700f3e
Bump rspec-rails from 3.9.0 to 3.9.1 ( #13305 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
fed0a9f7a1
Bump simplecov from 0.18.2 to 0.18.5 ( #13310 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.18.2 to 0.18.5.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.2...v0.18.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
6fa22982d4
Bump i18n-tasks from 0.9.30 to 0.9.31 ( #13304 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.30 to 0.9.31.
- [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.30...v0.9.31 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
792fc1b32f
Bump browser from 3.0.3 to 4.0.0 ( #13307 )
...
Bumps [browser](https://github.com/fnando/browser ) from 3.0.3 to 4.0.0.
- [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/v3.0.3...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
99fc46d023
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
Updating rails-ujs, no real conflict, but a comment to close to changed
code. Various glitch-soc-only files have been updated to match those changes,
though.
- `package.json`:
No real conflict, just an additional dependency in glitch-soc that was too
close to something updated upstream. Took upstream's changes.
5 years ago
db15d0c975
Bump sidekiq-unique-jobs from 6.0.18 to 6.0.20 ( #13294 )
5 years ago
75ba543aa5
Bump sidekiq from 5.2.7 to 6.0.4 ( #11727 )
...
* Bump sidekiq from 5.2.7 to 6.0.0
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.7 to 6.0.0.
- [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.7...v6.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Sidekiq::Logger.logger -> Sidekiq.logger
* Drop support Ruby 2.4
* update
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
5 years ago
e196dca9e5
[Security] Bump omniauth from 1.9.0 to 1.9.1 ( #13229 )
...
Bumps [omniauth](https://github.com/omniauth/omniauth ) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases )
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
60783cd48a
Bump capistrano from 3.11.2 to 3.12.1 ( #13264 )
...
* Bump capistrano from 3.11.2 to 3.12.1
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.2...v3.12.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Bump capistrano from 3.11.2 to 3.12.1
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
5 years ago
656452a5a9
Bump webmock from 3.8.0 to 3.8.3 ( #13265 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.0 to 3.8.3.
- [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.8.0...v3.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
2cd8126a92
Bump sidekiq-scheduler from 3.0.0 to 3.0.1 ( #13233 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.0...v3.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
b696cd5d8b
Bump simple_form from 5.0.1 to 5.0.2 ( #13231 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 5.0.1 to 5.0.2.
- [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.1...v5.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
fcaac8f056
Bump json-ld from 3.1.0 to 3.1.1 ( #13230 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.0...3.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
b4bc2817ba
Bump cld3 from 3.2.6 to 3.3.0 ( #13107 )
...
* Bump cld3 from 3.2.6 to 3.3.0
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.2.6 to 3.3.0.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.6...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Fix compatibility with cld3 3.3.0
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
5 years ago
0fd3f87ea2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Conflict due to upstream adding a new parameter (with_rate_limit),
too close to glitch-soc's own additional parameter (content_type).
Added upstream's parameter.
- `app/services/post_status_service.rb`:
Conflict due to upstream adding a new parameter (rate_limit),
too close to glitch-soc's own additional parameter (content_type).
Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to us not exposing theme settings here (as we have
a different flavour/skin menu).
Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
Coding style fixes for a part we have rewritten.
Discarded upstream changes.
5 years ago
d787fe9383
Bump doorkeeper from 5.2.3 to 5.3.1 ( #13144 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.3 to 5.3.1.
- [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.2.3...v.5.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
db456a9acc
Bump json-ld-preloaded from 3.1.0 to 3.1.1 ( #13143 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0150972fc4
Bump oj from 3.10.1 to 3.10.3 ( #13187 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.1 to 3.10.3.
- [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.1...v3.10.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
37c9e574d1
Bump strong_migrations from 0.5.1 to 0.6.2 ( #13071 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.5.1 to 0.6.2.
- [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.1...v0.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
d34b90c846
Bump puma from 4.3.2 to 4.3.3 ( #13177 )
...
This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
5 years ago
7e847c3f3c
Update puma from 4.3.2 to 4.3.3
...
Fixes #1294
This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
5 years ago
97be4b34c5
Update glitch-soc-specific dependencies
...
- drop html2text which has been unused in a while
- update redcarpet
5 years ago
d46263b0f9
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
dfadd78057
Fix elasticsearch-api and faraday incompatibilities ( #13166 )
5 years ago
0a969764c3
[Security] Bump puma from 4.3.1 to 4.3.2 ( #13167 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.1 to 4.3.2. **This update includes a security fix.**
- [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.3.1...v4.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ea391ce8a1
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
296828907c
Bump rack from 2.1.2 to 2.2.2 ( #13108 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.1.2 to 2.2.2.
- [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.1.2...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
8e8cce20c7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
2d1e769137
Bump simplecov from 0.18.1 to 0.18.2 ( #13106 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.18.1 to 0.18.2.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.1...v0.18.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
79edec6f3a
Bump pkg-config from 1.4.0 to 1.4.1 ( #13105 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.0...1.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1d44123599
Bump nokogiri from 1.10.7 to 1.10.8 ( #13110 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.7 to 1.10.8.
- [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.7...v1.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
8532bc72bd
Bump json-ld-preloaded from 3.0.6 to 3.1.0 ( #12982 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.6 to 3.1.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.6...3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f00064da6b
Bump rubocop-rails from 2.4.1 to 2.4.2 ( #12984 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.1 to 2.4.2.
- [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.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0f1358f56e
Bump capybara from 3.30.0 to 3.31.0 ( #12983 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.30.0 to 3.31.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.30.0...3.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
022c0c0d4f
Bump simplecov from 0.17.1 to 0.18.1 ( #13027 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.17.1 to 0.18.1.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.1...v0.18.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
027fa11903
Bump pry-byebug from 3.7.0 to 3.8.0 ( #12985 )
...
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug ) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.7.0...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
20f496a917
Bump letter_opener_web from 1.3.4 to 1.4.0 ( #13028 )
...
Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web ) from 1.3.4 to 1.4.0.
- [Release notes](https://github.com/fgrehm/letter_opener_web/releases )
- [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.3.4...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b89d5a7408
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `Gemfile.lock`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
Upstream added better unsupported link stripping,
while we had different sanitizing configs.
Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
Strings unused in glitch-soc had been removed from
glitch-soc, reintroduced them even if they are not
useful, to reduce the risk of later merge conflicts.
5 years ago
6ad3b7bee1
Bump httplog from 1.4.1 to 1.4.2 ( #13059 )
5 years ago
36491cda49
update gemfile.lock for httplog 1.4.1
5 years ago
5839b108f2
Bump httplog from 1.4.0 to 1.4.1. ( #13051 )
...
httplog 1.4.0 is yanked.
5 years ago
fbf97961fc
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
4e90375279
Fix Gemfile.lock ( #12995 )
...
* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues
* Fix deprecation warnings
* Fix Gemfile.lock
* More changes to catch Gemfile.lock issues
5 years ago
4533a6c264
Bump Rack from 2.0.8 to 2.1.2 ( #12991 )
...
* Update Gemfile
* Update Gemfile.lock
5 years ago
9604766a18
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
Upstream added code too close to glitch-soc-specific followers-hiding code.
Ported upstream changes.
5 years ago
da7c7cba19
Explicitly install rack gem ( #12972 )
...
Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`:
```
NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...>
```
5 years ago
6719b9daa5
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
5 years ago
a2eba1aee3
Bump httplog from 1.3.3 to 1.4.0 ( #12902 )
...
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>
5 years ago
1f7e7594db
Merge branch 'master' into glitch-soc/master
...
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.
5 years ago
805af753a1
Bump parallel_tests from 2.30.0 to 2.30.1 ( #12901 )
...
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>
5 years ago
00cbabf803
Bump faker from 2.10.0 to 2.10.1 ( #12899 )
...
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>
5 years ago
a1a8d02beb
Bump capistrano-rbenv from 2.1.4 to 2.1.6 ( #12898 )
...
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>
5 years ago
25b073ae85
Bump webmock from 3.7.6 to 3.8.0 ( #12900 )
...
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>
5 years ago
5e9dd2dcbf
Bump i18n-tasks from 0.9.29 to 0.9.30 ( #12903 )
...
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>
5 years ago
9c01f010ca
Bump oj from 3.10.0 to 3.10.1 ( #12897 )
...
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>
5 years ago
23fbcfcd85
Bump browser from 2.7.1 to 3.0.3 ( #12850 )
...
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>
5 years ago
fcf65e86bb
Remove derailed_benchmarks dependency ( #12861 )
5 years ago
9a88e4204d
Bump pg from 1.2.1 to 1.2.2 ( #12854 )
...
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>
5 years ago
287bd7d4f9
Bump ox from 2.11.0 to 2.12.1 ( #12853 )
...
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>
5 years ago
fec5a41721
Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 ( #12852 )
...
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](e742697a09
5 years ago
89fc4613cb
Bump rubocop from 0.78.0 to 0.79.0 ( #12851 )
...
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>
5 years ago
62e596b423
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
99795c20e7
Bump rubocop-rails from 2.4.0 to 2.4.1 ( #12780 )
...
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>
5 years ago
82e197787f
Merge branch 'master' into glitch-soc/merge-upstream
...
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
5 years ago
c297a1e7a7
Fix Ruby 2.7 support ( #12831 )
...
- 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
5 years ago
f791cb2994
Remove ostatus2 gem from lockfile ( #12826 )
5 years ago
1b5314cd74
Update lockfile for #12800 ( #12825 )
5 years ago
96b43ad187
Remove dependency on OStatus2 gem ( #12822 )
5 years ago
7c29cd78b4
Bump rqrcode from 0.10.1 to 1.1.2 ( #12357 )
...
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>
5 years ago
a709be3868
Bump rdf-normalize from 0.3.3 to 0.4.0 ( #12785 )
...
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>
5 years ago
ffe8104398
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
9a860a142b
Bump pg from 1.2.0 to 1.2.1 ( #12783 )
...
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>
5 years ago
1f5eb27d50
Bump aws-sdk-s3 from 1.59.0 to 1.60.1 ( #12784 )
...
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>
5 years ago
a7a89bf997
Bump bullet from 6.0.2 to 6.1.0 ( #12782 )
...
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>
5 years ago
332d252d00
Bump capybara from 3.29.0 to 3.30.0 ( #12781 )
...
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>
5 years ago
9852c25c95
Update lockfile for #12758 ( #12762 )
5 years ago
2591cedcad
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
Conflict due to theming system.
5 years ago
1e1db2c508
Gemfile Updates - Others ( #12761 )
...
* Update Gemfile.lock
* Update Gemfile
* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile
* Update Gemfile.lock
5 years ago
aea32f596c
Gemfile Updates - fixes warnings ( #12759 )
...
* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile
5 years ago
e0e067d569
Bump stackprof from 0.2.14 to 0.2.15 ( #12726 )
...
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>
5 years ago
25134319e8
Bump pg from 1.1.4 to 1.2.0 ( #12725 )
...
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>
5 years ago
29c12522f0
Bump redis-namespace from 1.6.0 to 1.7.0 ( #12727 )
...
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>
5 years ago
8ba7008cbd
Bump faker from 2.9.0 to 2.10.0 ( #12728 )
...
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>
5 years ago
a85b29d2e2
Bump derailed_benchmarks from 1.4.2 to 1.4.3 ( #12729 )
...
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>
5 years ago
1356f0a8a3
Bump rack-cors from 1.1.0 to 1.1.1 ( #12730 )
...
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>
5 years ago
c3e286a526
Circleci - Upgrade to Buster Images ( #12705 )
...
* Update config.yml
* Update Gemfile.lock
5 years ago
96d17e8437
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`
- `package.json`
5 years ago
8079a99f69
Bump rubocop from 0.77.0 to 0.78.0 ( #12677 )
...
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>
5 years ago
de2082c658
Bump faker from 2.8.1 to 2.9.0 ( #12680 )
...
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>
5 years ago
1963edc90c
Bump strong_migrations from 0.5.0 to 0.5.1 ( #12679 )
...
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>
5 years ago
36e2459806
Bump rails from 5.2.4 to 5.2.4.1 ( #12682 )
...
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>
5 years ago
806ab00db8
Bump rack-attack from 6.2.1 to 6.2.2 ( #12681 )
...
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>
5 years ago
10bb570d84
Bump oj from 3.9.2 to 3.10.0 ( #12683 )
...
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>
5 years ago
fa4a92e340
Merge branch 'master' into glitch-soc/master
...
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
5 years ago
031093e9ca
[Security] Bump rack from 2.0.7 to 2.0.8 ( #12654 )
...
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>
5 years ago
c9bb21aed0
Bump rails from 5.2.3 to 5.2.4 ( #12584 )
...
* 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
5 years ago
89ae3ea278
Bump json-ld-preloaded from 3.0.4 to 3.0.6 ( #12361 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.4 to 3.0.6.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.4...3.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
74c907d29c
Bump webpacker from 4.2.0 to 4.2.2 ( #12632 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v4.2.0...v4.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b547e5a3c8
Bump doorkeeper from 5.2.2 to 5.2.3 ( #12630 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.2 to 5.2.3.
- [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.2.2...v5.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
24c87fb84b
Bump stackprof from 0.2.13 to 0.2.14 ( #12631 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.13 to 0.2.14.
- [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.13...v0.2.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c28e0efae4
Bump parallel_tests from 2.29.2 to 2.30.0 ( #12634 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.29.2 to 2.30.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.2...v2.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
cf953596de
Bump faker from 2.8.0 to 2.8.1 ( #12633 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.8.0 to 2.8.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.8.0...v2.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
bd7736b08b
[Security] Bump excon from 0.62.0 to 0.71.0 ( #12638 )
...
Bumps [excon](https://github.com/excon/excon ) from 0.62.0 to 0.71.0. **This update includes a security fix.**
- [Release notes](https://github.com/excon/excon/releases )
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt )
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dc173af0b9
Bump nokogiri from 1.10.5 to 1.10.7 ( #12586 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.5 to 1.10.7.
- [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.5...v1.10.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
d5a5056eba
Bump rubocop from 0.76.0 to 0.77.0 ( #12585 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.76.0 to 0.77.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.76.0...v0.77.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e859334b33
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
Minor conflict due to glitch-soc's theming system
5 years ago
1e0801b45d
Bump aws-sdk-s3 from 1.57.0 to 1.59.0 ( #12581 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.57.0 to 1.59.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.57.0...v1.59.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f673e3d120
Bump strong_migrations from 0.4.2 to 0.5.0 ( #12583 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.4.2 to 0.5.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.4.2...v0.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0863d54a8c
Bump sidekiq-unique-jobs from 6.0.15 to 6.0.18 ( #12582 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.15 to 6.0.18.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.15...v6.0.18 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
2cc60e8b09
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- package.json
Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
Not really a conflict, caused by an additional dependency in glitch-soc.
5 years ago
af15853752
[Security] Bump puma from 4.2.0 to 4.3.1 ( #12559 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.2.0 to 4.3.1. **This update includes a security fix.**
- [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.2.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
d10a8c7ee8
Bump faker from 2.7.0 to 2.8.0 ( #12531 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.7.0 to 2.8.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.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1d2cb53ef4
Bump brakeman from 4.7.1 to 4.7.2 ( #12530 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.7.1 to 4.7.2.
- [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.7.1...v4.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
78df875c99
Bump aws-sdk-s3 from 1.55.0 to 1.57.0 ( #12528 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.55.0 to 1.57.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.55.0...v1.57.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7075764baa
Bump tty-prompt from 0.19.0 to 0.20.0 ( #12529 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.19.0 to 0.20.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.19.0...v0.20.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1bdc5a20ea
Bump rubocop-rails from 2.3.2 to 2.4.0 ( #12532 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.2 to 2.4.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.3.2...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
67415bbcf1
Bump fabrication from 2.20.2 to 2.21.0 ( #12527 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.20.2 to 2.21.0.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/compare/2.20.2...2.21.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e48f63787d
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
2337455895
Bump net-ldap from 0.16.1 to 0.16.2 ( #12479 )
...
Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap ) from 0.16.1 to 0.16.2.
- [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.1...v0.16.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
fa994d78dd
Bump parallel from 1.18.0 to 1.19.1 ( #12475 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.18.0 to 1.19.1.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.18.0...v1.19.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9c0deae4cc
Bump browser from 2.6.1 to 2.7.1 ( #12490 )
...
Bumps [browser](https://github.com/fnando/browser ) from 2.6.1 to 2.7.1.
- [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.6.1...v2.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
02ed19848e
Bump rack-cors from 1.0.6 to 1.1.0 ( #12477 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.0.6 to 1.1.0.
- [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.0.6...v1.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a2a3f54beb
Bump browser from 2.6.1 to 2.7.0 ( #12476 )
...
Bumps [browser](https://github.com/fnando/browser ) from 2.6.1 to 2.7.0.
- [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.6.1...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b0c9c62954
Bump charlock_holmes from 0.7.6 to 0.7.7 ( #12474 )
...
Bumps [charlock_holmes](https://github.com/brianmario/charlock_holmes ) from 0.7.6 to 0.7.7.
- [Release notes](https://github.com/brianmario/charlock_holmes/releases )
- [Commits](https://github.com/brianmario/charlock_holmes/compare/0.7.6...v0.7.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7c78c5142f
Bump pghero from 2.3.0 to 2.4.1 ( #12478 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.3.0 to 2.4.1.
- [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.3.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
d0be1d0cde
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
1346774607
Bump webpacker from 4.0.7 to 4.2.0 ( #12416 )
...
* Bump webpacker from 4.0.7 to 4.2.0
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.0.7 to 4.2.0.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v4.0.7...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Use NODE_ENV=tests instead of test, to work around async modules not having a chunk
5 years ago
a96375d2ef
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
5 years ago
f650d29524
Bump aws-sdk-s3 from 1.52.0 to 1.55.0 ( #12419 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.52.0 to 1.55.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.52.0...v1.55.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
89fa6c39f3
Bump derailed_benchmarks from 1.4.1 to 1.4.2 ( #12418 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.4.1 to 1.4.2.
- [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.1...v1.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1b3a454023
Bump httplog from 1.3.2 to 1.3.3 ( #12420 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.3.2 to 1.3.3.
- [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.2...v1.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
fce9db69c9
Bump rack-attack from 6.1.0 to 6.2.1 ( #12421 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.1.0 to 6.2.1.
- [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.1.0...v6.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4f057ce7e6
Bump doorkeeper from 5.2.1 to 5.2.2 ( #12417 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.1 to 5.2.2.
- [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.2.1...v5.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ca186a0455
[Security] Bump nokogiri from 1.10.4 to 1.10.5 ( #12404 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.4 to 1.10.5. **This update includes a security fix.**
- [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.4...v1.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b91414e880
[Security] Bump rack-cors from 1.0.3 to 1.0.6 ( #12395 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.0.3 to 1.0.6. **This update includes a security fix.**
- [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.0.3...v1.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
40f5df1fd7
Bump parallel from 1.17.0 to 1.18.0 ( #12358 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.17.0...v1.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ec51b4c947
Bump rubocop from 0.75.1 to 0.76.0 ( #12355 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.75.1 to 0.76.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.75.1...v0.76.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
151d157a5d
Bump faker from 2.6.0 to 2.7.0 ( #12354 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.6.0 to 2.7.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.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b6a81e6b3b
Bump annotate from 3.0.2 to 3.0.3 ( #12359 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.2...v3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
45092bbb08
Bump stoplight from 2.1.3 to 2.2.0 ( #12360 )
...
Bumps [stoplight](https://github.com/orgsync/stoplight ) from 2.1.3 to 2.2.0.
- [Release notes](https://github.com/orgsync/stoplight/releases )
- [Changelog](https://github.com/orgsync/stoplight/blob/master/CHANGELOG.md )
- [Commits](https://github.com/orgsync/stoplight/compare/v2.1.3...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5f4a2b0d32
Bump fuubar from 2.4.1 to 2.5.0 ( #12356 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.4.1...releases/v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5af865b2ab
[Security] Bump brakeman from 4.6.1 to 4.7.1 ( #12329 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.6.1 to 4.7.1. **This update includes a security fix.**
- [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.6.1...v4.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e7655951d7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
5 years ago
84a2c5cff9
Bump aws-sdk-s3 from 1.48.0 to 1.52.0 ( #12250 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.48.0 to 1.52.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.48.0...v1.52.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
482b41468c
Bump annotate from 2.7.5 to 3.0.2 ( #12100 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 2.7.5 to 3.0.2.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc )
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.5...v3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3cddf475fa
[Security] Bump simple_form from 4.1.0 to 5.0.1 ( #12099 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.1.0 to 5.0.1. **This update includes a security fix.**
- [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.1.0...v5.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
238f9fc32b
Bump rspec-rails from 3.8.2 to 3.9.0 ( #12241 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
2f6c1cb097
Bump strong_migrations from 0.4.1 to 0.4.2 ( #12242 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.4.1 to 0.4.2.
- [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.4.1...v0.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a47558a243
Bump active_record_query_trace from 1.6.2 to 1.7 ( #12243 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6.2 to 1.7.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.2...v1.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
eaa085b063
Bump pkg-config from 1.3.9 to 1.4.0 ( #12239 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.3.9 to 1.4.0.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.3.9...1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
114edcf560
Bump faker from 2.5.0 to 2.6.0 ( #12244 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.5.0 to 2.6.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.5.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e76f4056e5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
5 years ago
e076a00029
[Security] Bump loofah from 2.2.3 to 2.3.1 ( #12203 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.3 to 2.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
be6bf3f097
Bump oj from 3.9.1 to 3.9.2 ( #12104 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.1 to 3.9.2.
- [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.1...v3.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0caa903ced
Bump stackprof from 0.2.12 to 0.2.13 ( #12103 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.12 to 0.2.13.
- [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.12...v0.2.13 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b4f9033eb5
Bump sidekiq-unique-jobs from 6.0.13 to 6.0.15 ( #12102 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.13 to 6.0.15.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.13...v6.0.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
d578c6cfd4
Bump derailed_benchmarks from 1.4.0 to 1.4.1 ( #12101 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.4.0 to 1.4.1.
- [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.0...v1.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
cd317acb71
Bump rubocop from 0.74.0 to 0.75.1 ( #12191 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.74.0 to 0.75.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.74.0...v0.75.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9506d9cafc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
5 years ago
07abea7ba8
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
5 years ago
9fa40f1f0a
Bump capistrano from 3.11.1 to 3.11.2 ( #12012 )
...
* Bump capistrano from 3.11.1 to 3.11.2
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.1...v3.11.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Bump capistrano from 3.11.1 to 3.11.2
5 years ago
bbf15e78ba
Bump pkg-config from 1.3.8 to 1.3.9 ( #12011 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.3.8 to 1.3.9.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.3.8...1.3.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
29d2d28119
Bump faker from 2.4.0 to 2.5.0 ( #12010 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.4.0 to 2.5.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.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0737180a83
Bump tty-command from 0.8.2 to 0.9.0 ( #12009 )
...
Bumps [tty-command](https://github.com/piotrmurach/tty-command ) from 0.8.2 to 0.9.0.
- [Release notes](https://github.com/piotrmurach/tty-command/releases )
- [Changelog](https://github.com/piotrmurach/tty-command/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-command/compare/v0.8.2...v0.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
66a903d1ad
Bump webmock from 3.7.5 to 3.7.6 ( #12008 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.5 to 3.7.6.
- [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.5...v3.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ac7c1fb62c
Bump derailed_benchmarks from 1.3.6 to 1.4.0 ( #12007 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.3.6 to 1.4.0.
- [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.3.6...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0baf951700
Bump patch level of Ruby ( #12070 )
...
Cosmetic change: patch level for the released 2.6.5 is p114.
5 years ago
c2d6ef1b64
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
5 years ago
38d2632b90
Add parallelization to `tootctl search deploy` ( #12051 )
...
* 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
5 years ago
216594fe26
Use Ruby 2.6.5 ( #12049 )
5 years ago
cc94c90bf1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
5 years ago
fe3de62124
Use Ruby-2.6.4 ( #11942 )
5 years ago
161b0a0958
Hide error message on /heath ( #11947 )
...
* Hide error message on /heath
* update health_check
5 years ago
aa6911a605
Bump puma from 4.1.1 to 4.2.0 ( #11939 )
...
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>
5 years ago
90f8e64e0a
Bump doorkeeper from 5.2.0 to 5.2.1 ( #11934 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.0 to 5.2.1.
- [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.2.0...v5.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
fd1efcaeac
Bump webmock from 3.7.3 to 3.7.5 ( #11936 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.3 to 3.7.5.
- [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.3...v3.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4d2b257240
Bump simplecov from 0.17.0 to 0.17.1 ( #11932 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3be4ee3a63
Bump chewy from 5.0.0 to 5.0.1 ( #11935 )
...
Bumps [chewy](https://github.com/toptal/chewy ) from 5.0.0 to 5.0.1.
- [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.0.0...v5.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3adb0ad5ab
Bump redis from 4.1.2 to 4.1.3 ( #11938 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.1.2 to 4.1.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.1.2...v4.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7d821c828f
Bump faker from 2.3.0 to 2.4.0 ( #11933 )
...
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>
5 years ago
5ce267efd0
Bump doorkeeper from 5.1.0 to 5.2.0 ( #11856 )
...
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>
5 years ago
4837d6275a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
5 years ago
605b78c717
Bump capybara from 3.28.0 to 3.29.0 ( #11854 )
...
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>
5 years ago
f31ee4685c
Bump webmock from 3.7.1 to 3.7.3 ( #11853 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.1 to 3.7.3.
- [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.1...v3.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b02f5b9463
Bump tzinfo-data from 1.2019.2 to 1.2019.3 ( #11857 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2019.2 to 1.2019.3.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.2...v1.2019.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3f69dab8e0
Bump faker from 2.2.2 to 2.3.0 ( #11858 )
...
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>
5 years ago
85afa898cd
Bump puma from 4.1.0 to 4.1.1 ( #11855 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.0 to 4.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/v4.1.0...v4.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f86b585390
Revert "Bump webpush from 0.3.8 to 1.0.0 ( #11614 )" ( #11840 )
...
This reverts commit c812a03e00
5 years ago
2e38d889a3
Merge branch 'master' into glitch-soc/merge-upstream
...
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)
5 years ago
666c1a8a06
Change tootctl to use inline parallelization instead of Sidekiq ( #11776 )
...
- Remove --background option
- Add --concurrency(=5) option
- Add progress bars
5 years ago
c812a03e00
Bump webpush from 0.3.8 to 1.0.0 ( #11614 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.8 to 1.0.0.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.8...v1.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e3b216b2d8
Bump fastimage from 2.1.5 to 2.1.7 ( #11785 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.5 to 2.1.7.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.5...v2.1.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0dc9d8f95d
Bump sanitize from 5.0.0 to 5.1.0 ( #11786 )
...
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>
5 years ago
3ab5be74af
Bump mime-types from 3.2.2 to 3.3 ( #11788 )
...
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>
5 years ago
a019318f94
Bump json-ld-preloaded from 3.0.3 to 3.0.4 ( #11790 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.3...3.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9c1b1e9ca1
Bump oj from 3.9.0 to 3.9.1 ( #11789 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.0 to 3.9.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.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5265487ea0
Bump faker from 2.2.1 to 2.2.2 ( #11787 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.1 to 2.2.2.
- [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.1...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4b6bf21161
Bump devise from 4.7.0 to 4.7.1 ( #11784 )
...
* Bump devise from 4.7.0 to 4.7.1
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.0 to 4.7.1.
- [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.7.0...v4.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* bcrypt (3.1.12)
5 years ago
7544167f3c
Add healthcheck endpoint for web ( #11770 )
5 years ago
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
41152c7b99
Bump addressable from 2.6.0 to 2.7.0 ( #11732 )
...
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>
5 years ago
7599b4b3b6
Bump capistrano from 3.11.0 to 3.11.1 ( #11731 )
...
* Bump capistrano from 3.11.0 to 3.11.1
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* 3.11.1
5 years ago
17bb2b5e06
Bump aws-sdk-s3 from 1.46.0 to 1.48.0 ( #11729 )
...
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>
5 years ago
3d1a8d1eca
Bump rubocop-rails from 2.3.1 to 2.3.2 ( #11728 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.1 to 2.3.2.
- [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.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
decfba58ab
Bump bootsnap from 1.4.4 to 1.4.5 ( #11730 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.4 to 1.4.5.
- [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.4.4...v1.4.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
908db96571
Bump faker from 2.1.2 to 2.2.1 ( #11733 )
...
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>
5 years ago
645f9ffe45
Bump webmock from 3.6.2 to 3.7.1 ( #11734 )
...
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>
5 years ago
741b53651e
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
5 years ago
02fff98491
Fix JSON-LD deprecation warning in log output ( #11699 )
5 years ago
9cd6783781
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
b3141d0585
Revert bcrypt to 3.1.12, again ( #11693 )
...
Same reasons as in #11555
5 years ago
449a0727a7
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
5 years ago
196ad08e2d
Bump bullet from 6.0.1 to 6.0.2 ( #11666 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.1 to 6.0.2.
- [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.1...6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
244a0e61c0
Bump devise from 4.6.2 to 4.7.0 ( #11667 )
...
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>
5 years ago
2a1e43dffc
Bump rubocop-rails from 2.3.0 to 2.3.1 ( #11665 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.0 to 2.3.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.3.0...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
32c781ec6b
Add soft delete for statuses for instant deletes through API ( #11623 )
...
* 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
5 years ago
c060523dc2
Merge branch 'master' into glitch-soc/merge-upstream
...
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
5 years ago
e849d13fba
Bump pkg-config from 1.3.7 to 1.3.8 ( #11616 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.7...1.3.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
07fbf5d1d8
Bump simple-navigation from 4.0.5 to 4.1.0 ( #11617 )
...
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>
5 years ago
83e00255d2
Bump pghero from 2.2.1 to 2.3.0 ( #11615 )
...
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>
5 years ago
7b04ef05c3
Bump pundit from 2.0.1 to 2.1.0 ( #11613 )
...
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>
5 years ago
05588491a3
Bump rubocop-rails from 2.2.1 to 2.3.0 ( #11612 )
...
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>
5 years ago
eab02d822e
Bump oj from 3.8.1 to 3.9.0 ( #11611 )
...
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>
5 years ago
8aba819ed2
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
c656426415
Revert bcrypt to 3.1.12 ( #11555 )
5 years ago
f0362fa0ee
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
b977373304
Bump parallel_tests from 2.29.1 to 2.29.2 ( #11549 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.1...v2.29.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e7188e0cce
Bump devise-two-factor from 3.0.3 to 3.1.0 ( #11550 )
...
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>
5 years ago
f07af657fa
Bump puma from 4.0.1 to 4.1.0 ( #11548 )
...
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>
5 years ago
59d6720a90
Bump faker from 2.1.0 to 2.1.2 ( #11547 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.0 to 2.1.2.
- [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.0...v2.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1fdf24925a
[Security] Bump nokogiri from 1.10.3 to 1.10.4 ( #11540 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [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.3...v1.10.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ff76f6de4f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
5 years ago
dependabot-preview[bot]
Thibaut Girka
dependabot[bot]
Eugen Rochko
Yamagishi Kazutoshi
mayaeh
Lynne
Shlee
Daigo 3 Dango
Takeshi Umeda