f5f6d23d55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
6 years ago
fb8557e652
Bump rubocop from 0.66.0 to 0.67.1 ( #10475 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.66.0 to 0.67.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.66.0...v0.67.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
1682ac5717
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/following_accounts_controller.rb
Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
Some code has been change upstream, but it has been
moved to app/javascript/core/settings.js in glitch-soc.
Applied the changes there.
6 years ago
f86b2d8edb
Bump i18n-tasks from 0.9.28 to 0.9.29 ( #10451 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.28 to 0.9.29.
- [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.28...v0.9.29 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
6024964b1e
Bump capybara from 3.16.0 to 3.16.1 ( #10450 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.0 to 3.16.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.16.0...3.16.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4444d8f9b3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3b1c64cadc
Bump capybara from 3.15.0 to 3.16.0 ( #10415 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.15.0 to 3.16.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.15.0...3.16.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
050efbc126
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
6 years ago
24d5b6f9e3
Bump aws-sdk-s3 from 1.35.0 to 1.36.0 ( #10406 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.35.0 to 1.36.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.35.0...v1.36.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
85629bf3d3
Bump rails from 5.2.2.1 to 5.2.3 ( #10407 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
f46f67d984
[Security] Bump devise from 4.5.0 to 4.6.2 ( #10394 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.5.0 to 4.6.2. **This update includes security fixes.**
- [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.5.0...v4.6.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
319bce3d9d
Bump tzinfo-data from 1.2018.9 to 1.2019.1 ( #10396 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
852ca12753
Bump bootsnap from 1.4.1 to 1.4.2 ( #10395 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.1 to 1.4.2.
- [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.1...v1.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
b9f314bba7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
6 years ago
fcce135d27
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb
Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
6 years ago
0c1a05b281
Bump makara from 0.4.0 to 0.4.1 ( #10382 )
...
Bumps [makara]() from 0.4.0 to 0.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
792a0f106e
Bump dotenv-rails from 2.7.1 to 2.7.2 ( #10381 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.1...v2.7.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
6968ae79a0
Bump nokogiri from 1.10.1 to 1.10.2 ( #10380 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.1 to 1.10.2.
- [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.1...v1.10.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ac0cc692f5
Bump aws-sdk-s3 from 1.34.0 to 1.35.0 ( #10369 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.34.0 to 1.35.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.34.0...v1.35.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
035828f8c0
Bump rack-cors from 1.0.2 to 1.0.3 ( #10368 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.0.2 to 1.0.3.
- [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.2...v1.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
013a9e0bed
Bump memory_profiler from 0.9.12 to 0.9.13 ( #10341 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.12 to 0.9.13.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases )
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.12...v0.9.13 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
d23ff0c5c9
Bump aws-sdk-s3 from 1.33.0 to 1.34.0 ( #10342 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.33.0 to 1.34.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.33.0...v1.34.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
edd5441112
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
d66bbdd353
Bump puma from 3.12.0 to 3.12.1 ( #10331 )
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.0 to 3.12.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/v3.12.0...v3.12.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4f91c8510f
Bump oj from 3.7.10 to 3.7.11 ( #10332 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.10 to 3.7.11.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.10...v3.7.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
88be18125e
Bump capybara from 3.14.0 to 3.15.0 ( #10330 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.14.0 to 3.15.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.14.0...3.15.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
1d6152f440
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/en.yml
Conflict caused by the glitch-soc-specific “flavour” string being too close
to the newly introduced “identity_proofs” string. Just included both.
6 years ago
941b0adcae
Bump aws-sdk-s3 from 1.32.0 to 1.33.0 ( #10319 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.32.0 to 1.33.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.32.0...v1.33.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c95e3a2e34
Bump rubocop from 0.65.0 to 0.66.0 ( #10318 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.65.0 to 0.66.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.65.0...v0.66.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
291012ec0c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb
All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
6 years ago
f85b66eb8c
Bump brakeman from 4.4.0 to 4.5.0 ( #10309 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.4.0 to 4.5.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.4.0...v4.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
2bdb6dac28
Bump httplog from 1.2.1 to 1.2.2 ( #10311 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
14c6cbbf6b
Bump pkg-config from 1.3.6 to 1.3.7 ( #10310 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.6 to 1.3.7.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.6...1.3.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4df3b7cb06
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
Upstream removed the “Authorized followers” page and associated
translations. This is too close in the file to our glitch-soc-specific
“flavour” string. No actual conflict.
- config/locales/ja.yml
Same as above.
- config/locales/pl.yml
Same as above.
- config/navigation.rb
No real conflict. New route added too close to the glitch-soc-specific
“flavours” one.
- config/webpack/configuration.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- config/webpack/loaders/babel.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
The contents of this file have been moved to package.json.
- config/webpack/shared.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- config/webpacker.yml
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- jest.config.js
The contents of this file have been moved to package.json.
- package.json
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- yarn.lock
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
6 years ago
8347479f5d
Bump webpacker from 3.5.5 to 4.0.2 ( #10277 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 3.5.5 to 4.0.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/v3.5.5...v4.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
6 years ago
5a9978f02a
Bump aws-sdk-s3 from 1.31.0 to 1.32.0 ( #10279 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.31.0 to 1.32.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/1.31.0...v1.32.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
2e7b2b4da9
Bump oj from 3.7.9 to 3.7.10 ( #10278 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.9 to 3.7.10.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.9...v3.7.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
07eb31eeac
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
6 years ago
dfb9efae81
[Security] Bump rails from 5.2.2 to 5.2.2.1 ( #10257 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.2 to 5.2.2.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
02062aab55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
6 years ago
0a6840564a
Bump active_record_query_trace from 1.6.1 to 1.6.2 ( #10252 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6.1 to 1.6.2.
- [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.1...v1.6.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
6a8dc59eb8
Bump concurrent-ruby from 1.1.4 to 1.1.5 ( #10242 )
...
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby ) from 1.1.4 to 1.1.5.
- [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.4...v1.1.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
f3e7634156
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
c8122e84cc
Bump aws-sdk-s3 from 1.30.1 to 1.31.0 ( #10236 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.30.1 to 1.31.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/1.30.1...1.31.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
a558ef45d8
Bump pkg-config from 1.3.5 to 1.3.6 ( #10235 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.5 to 1.3.6.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.5...1.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
0a2e5abece
Bump active_record_query_trace from 1.6 to 1.6.1 ( #10237 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6 to 1.6.1.
- [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...v1.6.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
674fe32f97
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
9e33a71efa
Bump pkg-config from 1.3.4 to 1.3.5 ( #10218 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.4...1.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
9c5e7805cc
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
637c952ccb
Bump webpush from 0.3.6 to 0.3.7 ( #10205 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.6 to 0.3.7.
- [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.6...v0.3.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Thibaut Girka
dependabot[bot]
Yamagishi Kazutoshi