e5aadde0d5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4813053e97
Preload common JSON-LD contexts ( #9412 )
...
Fixes #9411
6 years ago
fda8506a9c
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3a75150a93
Bump oj from 3.7.1 to 3.7.4 ( #9393 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.1 to 3.7.4.
- [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.1...v3.7.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
1b7a2516e8
Bump fastimage from 2.1.4 to 2.1.5 ( #9395 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
77b9249250
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
45cdfe00c5
Bump aws-sdk-s3 from 1.25.0 to 1.27.0 ( #9385 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
33fbb0f65a
[Security] Bump rails from 5.2.1 to 5.2.1.1 ( #9383 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.1 to 5.2.1.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.1...v5.2.1.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
478abe3a58
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
6 years ago
2490dcffe4
Bump tty-prompt from 0.17.2 to 0.18.0 ( #9354 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.17.2 to 0.18.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.2...v0.18.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
fd8841ce92
Bump simple_form from 4.0.1 to 4.1.0 ( #9331 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.1...v4.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
65989166e0
Bump sidekiq-bulk from 0.1.1 to 0.2.0 ( #9306 )
...
Bumps [sidekiq-bulk](https://github.com/aprescott/sidekiq-bulk ) from 0.1.1 to 0.2.0.
- [Release notes](https://github.com/aprescott/sidekiq-bulk/releases )
- [Changelog](https://github.com/aprescott/sidekiq-bulk/blob/master/CHANGES.md )
- [Commits](https://github.com/aprescott/sidekiq-bulk/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c439d53587
Bump aws-sdk-s3 from 1.24.0 to 1.25.0 ( #9321 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
3c952f58a9
Bump capybara from 3.11.0 to 3.11.1 ( #9305 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.11.0 to 3.11.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.11.0...3.11.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
1d97ce7dd8
Bump aws-sdk-s3 from 1.23.1 to 1.24.0 ( #9289 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.23.1 to 1.24.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
82b626a3eb
Bump capybara from 3.10.1 to 3.11.0 ( #9285 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.10.1 to 3.11.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.10.1...3.11.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
b3553f992d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
a82563aebd
Bump parallel_tests from 2.26.2 to 2.27.0 ( #9263 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.26.2 to 2.27.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
acdc5d658b
Bump thor from 0.20.0 to 0.20.3 ( #9266 )
...
Bumps [thor](https://github.com/wycats/thor ) from 0.20.0 to 0.20.3.
- [Release notes](https://github.com/wycats/thor/releases )
- [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md )
- [Commits](https://github.com/wycats/thor/compare/v0.20.0...v0.20.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
a4be0edb1a
Bump oj from 3.7.0 to 3.7.1 ( #9265 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.0 to 3.7.1.
- [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.0...v3.7.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
aa2edec6c3
Bump bullet from 5.8.1 to 5.9.0 ( #9264 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.8.1...5.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
bf26c23205
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
39fb2ab658
Bump tty-prompt from 0.17.1 to 0.17.2 ( #9243 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.17.1 to 0.17.2.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.1...v0.17.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
6dfc7643d8
Bump sidekiq from 5.2.2 to 5.2.3 ( #9241 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.2 to 5.2.3.
- [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.2...v5.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
aed0348e73
Bump pry-rails from 0.3.6 to 0.3.7 ( #9242 )
...
Bumps [pry-rails](https://github.com/rweng/pry-rails ) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/rweng/pry-rails/releases )
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.6...v0.3.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
1e9a0a1a4d
Bump hiredis from 0.6.1 to 0.6.3 ( #9240 )
...
Bumps [hiredis](https://github.com/redis/hiredis-rb ) from 0.6.1 to 0.6.3.
- [Release notes](https://github.com/redis/hiredis-rb/releases )
- [Changelog](https://github.com/redis/hiredis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/hiredis-rb/compare/v0.6.1...v0.6.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
333d4cbf41
Bump bullet from 5.7.6 to 5.8.1 ( #9156 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.6 to 5.8.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
20b4adc3a9
Bump parallel_tests from 2.26.0 to 2.26.2 ( #9154 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.26.0 to 2.26.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.0...v2.26.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
900a0d9402
Bump aws-sdk-s3 from 1.23.0 to 1.23.1 ( #9174 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.23.0 to 1.23.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[bot] <support@dependabot.com>
6 years ago
91584828bb
Bump capybara from 3.10.0 to 3.10.1 ( #9216 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.10.0 to 3.10.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.10.0...3.10.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
473638701b
Bump pkg-config from 1.3.1 to 1.3.2 ( #9215 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.1 to 1.3.2.
- [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.1...1.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
e18018e930
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
15fd2bb8cd
[Security] Bump rack from 2.0.5 to 2.0.6 ( #9214 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.0.5 to 2.0.6. **This update includes security fixes.**
- [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.5...2.0.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
88d15e4f6c
Bump active_model_serializers from 0.10.7 to 0.10.8 ( #9209 )
...
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.7 to 0.10.8.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/master/CHANGELOG-0-10.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...v0.10.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
8c19b9abce
Bump rack-attack from 5.4.1 to 5.4.2 ( #9186 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 5.4.1 to 5.4.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/v5.4.1...v5.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
bdc036586f
Bump redis from 4.0.2 to 4.0.3 ( #9187 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.2 to 4.0.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.0.2...v4.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
fd18ed4cea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
6 years ago
4d5a219013
[Security] Bump loofah from 2.2.2 to 2.2.3 ( #9160 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [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.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
7406141a71
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
8633ac4b68
Bump oj from 3.6.12 to 3.7.0 ( #9155 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.12 to 3.7.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.6.12...v3.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
bd79977354
Bump i18n-tasks from master to 0.9.28 ( #9148 )
6 years ago
bc97c2ab8a
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
eaf49c5d94
Bump sanitize from 4.6.6 to 5.0.0 ( #9140 )
6 years ago
13ea29754d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/simple_form.ja.yml
Not a real conflict, one new string was introduced in
glitch and one in upstream.
6 years ago
543bcb5984
Update i18n-tasks to master ( #9139 )
6 years ago
469ef48ec6
Bump parallel_tests from 2.25.0 to 2.26.0 ( #9137 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.25.0 to 2.26.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
0da11a56a9
Bump tzinfo-data from 1.2018.6 to 1.2018.7 ( #9136 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.6 to 1.2018.7.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.6...v1.2018.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
b02fbdb5a5
Bump rubocop from 0.59.2 to 0.60.0 ( #9135 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.59.2 to 0.60.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.59.2...v0.60.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
9e7c002d69
Bump doorkeeper from 5.0.1 to 5.0.2 ( #9134 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.1...v5.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c954f89bdd
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
057c91a4e2
Update i18n-tasks and change CircleCI command ( #9104 )
...
* Update i18n-tasks and CircleCI command
* Fix #9088
* Update i18n-tasks
* Fix ast
6 years ago
c32a5f86b6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml
Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.
Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
6 years ago
24689747b9
Bump parallel_tests from 2.24.0 to 2.25.0 ( #9090 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.24.0 to 2.25.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.24.0...v2.25.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
0e1c4b7d77
Bump aws-sdk-s3 from 1.21.0 to 1.23.0 ( #9089 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.21.0 to 1.23.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
7be9dfa8c6
Fix missing plural keys ( #9084 )
...
* Update i18n-tasks to feature-missing-plural-keys
* Fix pluralizations with missing keys in Arabic
Fix #8554
* Add i18n-tasks missing-plural-keys to CircleCI
6 years ago
534a78c97e
Bump capybara from 3.9.0 to 3.10.0 ( #9077 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.9.0...3.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
704eff1159
Bump rspec-rails from 3.8.0 to 3.8.1 ( #9078 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.0 to 3.8.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.8.0...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
e08d12d1aa
Bump i18n-tasks from 0.9.26 to 0.9.27 ( #9079 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.26 to 0.9.27.
- [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.26...v0.9.27 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
b0038f959f
Bump i18n-tasks from 0.9.25 to 0.9.26 ( #9071 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.25 to 0.9.26.
- [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.25...v0.9.26 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
2b7b807df0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
c02aea6230
Bump parallel_tests from 2.23.0 to 2.24.0 ( #9064 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
46259a36d0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
6 years ago
5b02326d92
Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 ( #9049 )
...
Fix #8889
6 years ago
8b72ee011f
Bump strong_migrations from 0.3.0 to 0.3.1 ( #9015 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.3.0 to 0.3.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.3.0...v0.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
bd77b125d6
Bump tzinfo-data from 1.2018.5 to 1.2018.6 ( #9016 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.5 to 1.2018.6.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.5...v1.2018.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4d611170f2
Use Ruby ==2.5.2== 2.5.3 ( #9003 )
...
* Use Ruby 2.5.2
* Specify 2.5.2p104 as RUBY VERSION
Heorku refers to RUBY VERSION in Gemfile.lock
* Use ruby-2.5.3
6 years ago
8dd6c48031
Bump oj from 3.6.11 to 3.6.12 ( #8996 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.11 to 3.6.12.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.6.11...v3.6.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
84bbed8394
Bump strong_migrations from 0.2.3 to 0.3.0 ( #8991 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.2.3 to 0.3.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.3...v0.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ba8d358e0d
Bump pundit from 1.1.0 to 2.0.0 ( #8873 )
...
Bumps [pundit](https://github.com/varvet/pundit ) from 1.1.0 to 2.0.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/compare/v1.1.0...v2.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4121045113
Bump doorkeeper from 5.0.0 to 5.0.1 ( #8954 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
70a7f72fda
Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream
6 years ago
0167397218
Bump better_errors from 2.4.0 to 2.5.0 ( #8946 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
9c66e239d1
Bump bullet from 5.7.5 to 5.7.6 ( #8947 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
de89e3670e
Bump scss_lint from 0.57.0 to 0.57.1 ( #8948 )
...
Bumps [scss_lint](https://github.com/brigade/scss-lint ) from 0.57.0 to 0.57.1.
- [Release notes](https://github.com/brigade/scss-lint/releases )
- [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
8cb843039c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
6 years ago
02b17344fd
Bump capistrano-rails from 1.3.1 to 1.4.0 ( #8936 )
...
Bumps [capistrano-rails](https://github.com/capistrano/rails ) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases )
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
a1be1d17fe
Bump dotenv-rails from 2.2.2 to 2.5.0 ( #8934 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.2.2 to 2.5.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4580979e28
Bump faker from 1.8.7 to 1.9.1 ( #8935 )
...
Bumps [faker](https://github.com/stympy/faker ) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dbaded7ed2
Bump memory_profiler from 0.9.11 to 0.9.12 ( #8937 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.11 to 0.9.12.
- [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.11...v0.9.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
e303c0730f
Bump capybara from 3.8.2 to 3.9.0 ( #8924 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
7e089b5a31
Bump tty-prompt from 0.17.0 to 0.17.1 ( #8925 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
63581a9262
Bump aws-sdk-s3 from 1.20.0 to 1.21.0 ( #8926 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
098012ab39
Bump i18n-tasks from 0.9.21 to 0.9.25 ( #8923 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.21 to 0.9.25.
- [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.21...v0.9.25 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
bdbbbb1bdb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6c328374b4
Remove unused ruby-progressbar dependency ( #8896 )
...
* Remove unused ruby-progressbar dependency
* Remove unused colorize dependency
6 years ago
463f250f26
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
645442b1af
Bump omniauth-saml from 1.10.0 to 1.10.1 ( #8885 )
...
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml ) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases )
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.0...v1.10.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
524282ff6b
Bump parallel_tests from 2.21.3 to 2.23.0 ( #8884 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.21.3 to 2.23.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
b4fedcc15e
Bump puma from 3.11.4 to 3.12.0 ( #8883 )
...
Bumps [puma](https://github.com/puma/puma ) from 3.11.4 to 3.12.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
f627ea99e4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
db/migrate/20170716191202_add_hide_notifications_to_mute.rb
spec/controllers/application_controller_spec.rb
Took our version, upstream changes were only minor style linting.
6 years ago
5cdaec1ec2
[Security] Bump nokogiri from 1.8.4 to 1.8.5 ( #8881 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [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.8.4...v1.8.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dba3a17481
Bump fog-openstack, rspec-rails and fog-core ( #8877 )
...
Bumps [fog-openstack](https://github.com/fog/fog-openstack ), [rspec-rails](https://github.com/rspec/rspec-rails ) and [fog-core](https://github.com/fog/fog-core ). These dependencies needed to be updated together.
Updates `fog-openstack` from 0.3.6 to 1.0.3
- [Release notes](https://github.com/fog/fog-openstack/releases )
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fog/fog-openstack/compare/v0.3.6...v1.0.3 )
Updates `rspec-rails` from 3.7.2 to 3.8.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.7.2...v3.8.0 )
Updates `fog-core` from 1.45.0 to 2.1.2
- [Release notes](https://github.com/fog/fog-core/releases )
- [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md )
- [Commits](https://github.com/fog/fog-core/compare/v1.45.0...v2.1.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
5c7944c05d
Bump webmock from 3.3.0 to 3.4.2 ( #8874 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.3.0 to 3.4.2.
- [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.3.0...v3.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
f2fb5ff317
Bump fuubar from 2.3.1 to 2.3.2 ( #8875 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.3.1 to 2.3.2.
- [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.3.1...releases/v2.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
d5137ab0e0
Bump http from 3.2.0 to 3.3.0 ( #8871 )
...
Bumps [http](https://github.com/httprb/http ) from 3.2.0 to 3.3.0.
- [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/v3.2.0...v3.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
f038cd9386
Bump brakeman from 4.2.1 to 4.3.1 ( #8872 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.2.1 to 4.3.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.2.1...v4.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
236c64d3f2
Bump fog-openstack from 0.1.25 to 0.3.6 ( #8860 )
...
Bumps [fog-openstack](https://github.com/fog/fog-openstack ) from 0.1.25 to 0.3.6.
- [Release notes](https://github.com/fog/fog-openstack/releases )
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fog/fog-openstack/compare/v0.1.25...v0.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
df36e809d0
Bump aws-sdk-s3 from 1.9.1 to 1.20.0 ( #8848 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.9.1 to 1.20.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
31e72c8d8a
Bump capybara from 2.18.0 to 3.8.2 ( #8858 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 2.18.0 to 3.8.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/2.18.0...3.8.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
76a58fd933
Bump derailed_benchmarks from 1.3.4 to 1.3.5 ( #8857 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.3.4 to 1.3.5.
- [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.4...v1.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
26e789df21
Bump capistrano-rbenv from 2.1.3 to 2.1.4 ( #8859 )
...
Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv ) from 2.1.3 to 2.1.4.
- [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.3...v2.1.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
180c80e6a3
Bump pg from 1.0.0 to 1.1.3 ( #8856 )
...
Bumps [pg](https://bitbucket.org/ged/ruby-pg ) from 1.0.0 to 1.1.3.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc )
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.3..v1.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ae98c83af8
Bump httplog from 1.0.2 to 1.1.1 ( #8839 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.0.2 to 1.1.1.
- [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.0.2...v1.1.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
a7dcf7d1a8
Bump rubocop from 0.55.0 to 0.59.2 ( #8849 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.55.0 to 0.59.2.
- [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.55.0...v0.59.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
62d196a12e
Bump redis from 4.0.1 to 4.0.2 ( #8850 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.1 to 4.0.2.
- [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.0.1...v4.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
53ddb6d042
Bump fastimage from 2.1.1 to 2.1.4 ( #8847 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.1...v2.1.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c170f4af68
Bump webpush from 0.3.3 to 0.3.4 ( #8846 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.3...v0.3.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
e1e167a18f
Bump rack-attack from 5.2.0 to 5.4.1 ( #8838 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 5.2.0 to 5.4.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/v5.2.0...v5.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
5e51b53fc8
Promote colorize to top-level dependency ( #8844 )
6 years ago
dbc2386ed3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
44a3d97eb0
Bump annotate from 2.7.3 to 2.7.4 ( #8840 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 2.7.3 to 2.7.4.
- [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.3...v2.7.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
d54f7a2a91
Bump ox from 2.9.2 to 2.10.0 ( #8837 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.9.2 to 2.10.0.
- [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.9.2...v2.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
f5eaefc485
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
config/routes.rb
6 years ago
a976cb4b04
Bump strong_migrations from 0.2.2 to 0.2.3 ( #8818 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.2...v0.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
20af1615c1
Bump oj from 3.5.1 to 3.6.11 ( #8815 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.5.1 to 3.6.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.5.1...v3.6.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
7ea3526554
Bump bootsnap from 1.3.0 to 1.3.2 ( #8816 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.3.0 to 1.3.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.3.0...v1.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
3804744368
Bump simple_form from 4.0.0 to 4.0.1 ( #8814 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.0...v4.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
9464903154
Bump capistrano from 3.10.2 to 3.11.0 ( #8801 )
...
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.10.2 to 3.11.0.
- [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.10.2...v3.11.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
6ba78f634c
Bump stackprof from 0.2.11 to 0.2.12 ( #8803 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.11 to 0.2.12.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c2fef26762
Bump tty-command from 0.8.0 to 0.8.2 ( #8802 )
...
Bumps [tty-command](https://github.com/piotrmurach/tty-command ) from 0.8.0 to 0.8.2.
- [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.0...v0.8.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
bd27027411
Bump tzinfo-data from 1.2018.4 to 1.2018.5 ( #8800 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.4 to 1.2018.5.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.4...v1.2018.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
1b0972c6d7
Bump sidekiq-scheduler from 2.2.1 to 3.0.0 ( #8789 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v2.2.1...v3.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
43361423cf
Bump tty-prompt from 0.16.0 to 0.17.0 ( #8791 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.16.0 to 0.17.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.16.0...v0.17.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
98fc3a30d0
Bump memory_profiler from 0.9.10 to 0.9.11 ( #8790 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.10 to 0.9.11.
- [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.10...v0.9.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
45713852cf
Bump pkg-config from 1.3.0 to 1.3.1 ( #8788 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.0 to 1.3.1.
- [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.0...1.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
34203564d8
Bump devise from 4.4.3 to 4.5.0 ( #8778 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.4.3 to 4.5.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.4.3...v4.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
e1d6309727
Bump sidekiq from 5.1.3 to 5.2.2 ( #8779 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.1.3 to 5.2.2.
- [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.1.3...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ac467a1f7f
Bump mime-types from 3.1 to 3.2.2 ( #8781 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.1 to 3.2.2.
- [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.1...v3.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
008c2443d2
Bump sanitize from 4.6.4 to 4.6.6 ( #8783 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 4.6.4 to 4.6.6.
- [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/v4.6.4...v4.6.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c7bd9b4ea6
Bump pghero from 2.1.0 to 2.2.0 ( #8782 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.1.0 to 2.2.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.1.0...v2.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
9937eedb55
Update ruby dependencies ( #8743 )
...
* Update ffi to 1.9.25
* Update private_address_check to 0.5.0
6 years ago
ae5c237607
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Vagrantfile
app/javascript/packs/public.js
app/views/admin/settings/edit.html.haml
app/views/settings/preferences/show.html.haml
app/views/settings/profiles/show.html.haml
config/locales/es.yml
config/locales/simple_form.en.yml
config/webpack/configuration.js
config/webpack/loaders/babel.js
package.json
yarn.lock
Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
6 years ago
23ab704b2b
Upgrade Babel to version 7.0.0 ( #5925 )
6 years ago
9c693844d0
update devise_pam_authenticatable2, new feature: pam gets ip address of client ( #8623 )
6 years ago
4f4908311d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/api/v1/mutes_controller.rb
config/locales/simple_form.pl.yml
6 years ago
97c292e0d1
Add thor to Gemfile directly ( #8467 )
...
It's a common dependency, but just in case
6 years ago
ae4240d236
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/views/layouts/application.html.haml
Edited:
app/helpers/application_helper.rb
app/views/admin/domain_blocks/new.html.haml
Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.
Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
6 years ago
62d8a0832c
fix pam authentication for certain hostnames ( #8412 )
6 years ago
e6e600bffa
Upgrade Doorkeeper to 5.0.0 ( #8409 )
...
See doorkeeper-gem/doorkeeper#1137
6 years ago
98dccee657
Merge branch 'master' into glitch-soc/master
...
Conflicts:
config/routes.rb
Added the “endorsements” route from upstream.
6 years ago
97f2dc6761
Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote ( #8339 )
...
* Fix uncaching worker
* Revert to using Paperclip's filesystem backend instead of fog-local
fog-local has lots of concurrency issues, causing failure to delete files,
dangling file records, and spurious errors UncacheMediaWorker
6 years ago
b572332710
Upgrade doorkeeper to 4.4.2 ( #8321 )
6 years ago
c043697caa
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
464f5ec269
Revert "Upgrade Doorkeeper to 4.4.1 ( #8197 )" ( #8231 )
...
* Revert "Upgrade Doorkeeper to 4.4.1 (#8197 )"
This reverts commit 659556ab1f
6 years ago
59e3ad5162
Add Makara dependency to support read-replicas ( #8216 )
...
Not active by default unless config/database.yml is edited
6 years ago
659556ab1f
Upgrade Doorkeeper to 4.4.1 ( #8197 )
6 years ago
2b9de88f26
Update Rails ( #8141 )
...
* Update Rails
* fix Update Rails
6 years ago
81bd37b1a7
Update Rails ( #8141 )
...
* Update Rails
* fix Update Rails
6 years ago
8bd7b9b586
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
6 years ago
Thibaut Girka
dependabot[bot]
Eugen Rochko
Daigo 3 Dango
Grey Baker
Yamagishi Kazutoshi
Alexander
AkiraFukushima
S.H