tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
8,865 Commits 20 Branches 113 Tags 222 MiB
49bea8c46b
Commit Graph

507 Commits

Author SHA1 Message Date
dependabot[bot]
d5245434ec Bump rails from 5.2.1.1 to 5.2.2 (#9430) 
Bumps [rails](https://github.com/rails/rails) from 5.2.1.1 to 5.2.2.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 16:10:18 +09:00
dependabot[bot]
781c7be08b Bump rails-controller-testing from 1.0.3 to 1.0.4 (#9440) 
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 16:09:13 +09:00
dependabot[bot]
c73c463478 Bump rubocop from 0.60.0 to 0.61.0 (#9439) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.60.0 to 0.61.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.60.0...v0.61.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 16:08:54 +09:00
dependabot[bot]
a61ce1c947 Bump capybara from 3.11.1 to 3.12.0 (#9388) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.1 to 3.12.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.11.1...3.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 09:27:17 +09:00
dependabot[bot]
4ad6bac447 Bump rails-controller-testing from 1.0.2 to 1.0.3 (#9417) 
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 09:26:55 +09:00
dependabot[bot]
2b657c175f Bump pry-rails from 0.3.7 to 0.3.8 (#9418) 
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/rweng/pry-rails/releases)
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 09:26:40 +09:00
Thibaut Girka
d32d33f408 Merge branch 'master' into glitch-soc/merge-upstream 2018-12-02 20:29:14 +01:00
ThibG
84e5ed43e7 Preload common JSON-LD contexts (#9412) 
Fixes #9411
 2018-12-02 16:46:13 +01:00
Thibaut Girka
bc8411ec87 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +01:00
dependabot[bot]
d0453e77dc 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>
 2018-11-30 19:09:31 +01:00
dependabot[bot]
5866e0b909 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>
 2018-11-30 19:08:31 +01:00
Thibaut Girka
ad7a3974cc Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
dependabot[bot]
6fac300ea4 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>
 2018-11-28 16:34:53 +01:00
dependabot[bot]
7f68452a15 [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>
 2018-11-27 23:34:39 +01:00
Thibaut Girka
f8e07ca5cd 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).
 2018-11-27 13:23:02 +01:00
dependabot[bot]
d5fac45f5b 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>
 2018-11-27 12:27:00 +01:00
dependabot[bot]
0206d569c3 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>
 2018-11-23 14:29:59 +09:00
dependabot[bot]
473998ca27 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>
 2018-11-22 12:47:36 +01:00
dependabot[bot]
c100e82a56 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>
 2018-11-22 12:47:14 +01:00
dependabot[bot]
7278e32745 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>
 2018-11-22 12:46:57 +01:00
dependabot[bot]
367ad21995 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>
 2018-11-16 11:19:09 +01:00
dependabot[bot]
96165a29ba 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>
 2018-11-15 14:49:06 +09:00
Thibaut Girka
bfe2b9cc50 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-13 16:28:07 +01:00
dependabot[bot]
c81bdafb07 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>
 2018-11-12 12:50:48 +01:00
dependabot[bot]
971863c426 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>
 2018-11-12 12:50:21 +01:00
dependabot[bot]
111ad86680 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>
 2018-11-12 12:50:12 +01:00
dependabot[bot]
fe57d73e4c 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>
 2018-11-12 12:49:51 +01:00
Thibaut Girka
9201398507 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-09 14:56:31 +01:00
dependabot[bot]
0319361fa3 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>
 2018-11-09 09:07:45 +01:00
dependabot[bot]
31af76a72c 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>
 2018-11-09 06:56:46 +01:00
dependabot[bot]
2cdbe18c22 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>
 2018-11-09 06:55:41 +01:00
dependabot[bot]
12401000d8 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>
 2018-11-09 06:55:19 +01:00
dependabot[bot]
f055907857 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>
 2018-11-08 21:15:33 +01:00
dependabot[bot]
6e44e27e09 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>
 2018-11-08 21:15:08 +01:00
dependabot[bot]
9d0e61167f 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>
 2018-11-08 21:14:25 +01:00
dependabot[bot]
e50a7cbc69 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>
 2018-11-08 21:13:44 +01:00
dependabot[bot]
a28441144e 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>
 2018-11-08 21:13:27 +01:00
Thibaut Girka
36dab188fd Merge branch 'master' into glitch-soc/merge-upstream 2018-11-06 15:22:44 +01:00
dependabot[bot]
7775225d17 [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>
 2018-11-06 05:36:56 +01:00
dependabot[bot]
535ce84896 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>
 2018-11-05 19:01:17 +01:00
dependabot[bot]
f5ebb739ec 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>
 2018-11-05 18:50:53 +01:00
dependabot[bot]
87ca51878d 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>
 2018-11-03 09:34:43 +09:00
Thibaut Girka
1c448d6474 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.
 2018-10-30 17:52:08 +01:00
dependabot[bot]
c1eec9869e [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>
 2018-10-30 22:59:11 +09:00
Thibaut Girka
94ad76a5b9 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 11:22:25 +01:00
dependabot[bot]
6771e8c88c 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>
 2018-10-30 06:39:52 +01:00
Eugen Rochko
d4415cc316
Bump i18n-tasks from master to 0.9.28 (#9148) 2018-10-30 01:06:47 +01:00
Thibaut Girka
f16d66c5c8 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-29 14:09:54 +01:00
Eugen Rochko
b40ea6d1d4
Bump sanitize from 4.6.6 to 5.0.0 (#9140) 2018-10-29 14:05:25 +01:00
Thibaut Girka
a942ad3062 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.
 2018-10-29 14:00:41 +01:00
Eugen Rochko
32f950a7a8
Update i18n-tasks to master (#9139) 2018-10-29 13:46:39 +01:00
dependabot[bot]
ce33ce94c9 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>
 2018-10-29 12:55:55 +01:00
dependabot[bot]
8c944c2f63 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>
 2018-10-29 12:55:34 +01:00
dependabot[bot]
3b89abc343 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>
 2018-10-29 12:55:16 +01:00
dependabot[bot]
5de592bcce 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>
 2018-10-29 12:54:56 +01:00
Thibaut Girka
b00f60f1d3 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
Eugen Rochko
26fe37c414
Update i18n-tasks and change CircleCI command (#9104) 
* Update i18n-tasks and CircleCI command

* Fix #9088

* Update i18n-tasks

* Fix ast
 2018-10-28 07:15:20 +01:00
Thibaut Girka
5bb8563f6c 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.
 2018-10-26 20:41:43 +02:00
dependabot[bot]
98b4cdf198 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>
 2018-10-25 08:29:25 +02:00
dependabot[bot]
4e6cffe00c 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>
 2018-10-25 08:29:12 +02:00
Eugen Rochko
df3a7e724d
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
 2018-10-25 00:09:45 +02:00
dependabot[bot]
9f3283086f 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>
 2018-10-24 23:22:18 +09:00
dependabot[bot]
c64234c31f 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>
 2018-10-24 07:51:04 +02:00
dependabot[bot]
c61af83de0 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>
 2018-10-24 07:50:34 +02:00
dependabot[bot]
e3a1955276 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>
 2018-10-23 23:11:37 +02:00
Thibaut Girka
8f3096b846 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-23 17:15:57 +02:00
dependabot[bot]
65867b6e61 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>
 2018-10-23 08:17:26 +02:00
Thibaut Girka
dcded13a99 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.
 2018-10-22 17:51:38 +02:00
Eugen Rochko
4f0bdbaaaf
Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049) 
Fix #8889
 2018-10-22 16:58:36 +02:00
dependabot[bot]
6c91f1a5b3 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>
 2018-10-19 18:51:40 +02:00
dependabot[bot]
c7b9e6f479 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>
 2018-10-19 20:20:07 +09:00
Daigo 3 Dango
e5762875a4 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
 2018-10-18 22:32:47 +02:00
dependabot[bot]
00387be289 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>
 2018-10-17 16:56:26 +02:00
dependabot[bot]
8b0a980e28 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>
 2018-10-16 07:50:09 +02:00
dependabot[bot]
734d55c3cf 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>
 2018-10-12 22:48:16 +02:00
dependabot[bot]
9ece873d62 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>
 2018-10-11 19:26:39 +02:00
Thibaut Girka
8f720be9f3 Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream 2018-10-11 14:12:36 +02:00
dependabot[bot]
ac7df62a04 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>
 2018-10-10 19:36:41 +02:00
dependabot[bot]
070f817177 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>
 2018-10-10 22:09:53 +09:00
dependabot[bot]
47d7381d60 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>
 2018-10-10 22:09:23 +09:00
Thibaut Girka
a02244f17c 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
 2018-10-09 21:08:26 +02:00
dependabot[bot]
46e4a759bb 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>
 2018-10-09 19:43:26 +02:00
dependabot[bot]
076ceffa84 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>
 2018-10-09 19:43:05 +02:00
dependabot[bot]
d4b7d75968 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>
 2018-10-09 19:59:34 +09:00
dependabot[bot]
a47c8545c7 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>
 2018-10-09 19:39:46 +09:00
Thibaut Girka
d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
dependabot[bot]
4c4ff05a46 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>
 2018-10-08 07:45:31 +02:00
dependabot[bot]
8639f000ea 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>
 2018-10-08 07:45:08 +02:00
dependabot[bot]
10e38b441f 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>
 2018-10-08 07:44:53 +02:00
dependabot[bot]
87ad9c408c 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>
 2018-10-08 14:24:07 +09:00
Thibaut Girka
611740ce81 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
Eugen Rochko
30dd7f3d90 Remove unused ruby-progressbar dependency (#8896) 
* Remove unused ruby-progressbar dependency

* Remove unused colorize dependency
 2018-10-06 08:33:26 +09:00
Thibaut Girka
98bb6815a7 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 21:48:25 +02:00
dependabot[bot]
9a42b75f00 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>
 2018-10-05 19:01:00 +02:00
dependabot[bot]
6812f811b1 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>
 2018-10-05 18:59:35 +02:00
dependabot[bot]
7c154c6afd 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>
 2018-10-05 18:58:13 +02:00
Thibaut Girka
00fcdebed7 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.
 2018-10-05 15:23:57 +02:00
dependabot[bot]
028ad4124c [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>
 2018-10-05 04:07:44 +02:00
dependabot[bot]
da8abef56d 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>
 2018-10-04 15:35:18 +02:00
dependabot[bot]
928102284a 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>
 2018-10-04 12:34:17 +02:00
dependabot[bot]
10f7916f37 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>
 2018-10-04 12:33:02 +02:00
dependabot[bot]
b70de2cf69 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>
 2018-10-04 12:32:26 +02:00
dependabot[bot]
ebb3631216 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>
 2018-10-04 12:31:22 +02:00
dependabot[bot]
ad459ab837 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>
 2018-10-04 01:07:13 +02:00
dependabot[bot]
941c9d0d42 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>
 2018-10-04 01:06:54 +02:00
dependabot[bot]
3b6ab82db7 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>
 2018-10-03 15:24:48 +02:00
dependabot[bot]
c62b88e3f2 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>
 2018-10-03 15:22:06 +02:00
dependabot[bot]
58410a54b0 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>
 2018-10-03 15:21:30 +02:00
dependabot[bot]
730f196b96 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>
 2018-10-03 15:20:56 +02:00
dependabot[bot]
53275b949e 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>
 2018-10-03 04:56:00 +02:00
dependabot[bot]
3f62b119e4 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>
 2018-10-02 20:16:51 +02:00
dependabot[bot]
d19b625394 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>
 2018-10-02 20:16:05 +02:00
dependabot[bot]
3dac956587 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>
 2018-10-02 17:20:52 +09:00
dependabot[bot]
b95d944625 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>
 2018-10-02 15:37:28 +09:00
dependabot[bot]
194ad2c90b 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>
 2018-10-01 22:49:26 +02:00
Grey Baker
3a2f007eb0 Promote colorize to top-level dependency (#8844) 2018-10-02 05:34:25 +09:00
Thibaut Girka
24d05c7a50 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 14:36:06 +02:00
dependabot[bot]
793fb7499d 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>
 2018-10-01 14:10:07 +02:00
dependabot[bot]
746da5ccda 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>
 2018-10-01 14:08:33 +02:00
Thibaut Girka
c91d9b7389 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
 2018-10-01 12:43:20 +02:00
dependabot[bot]
e02c45941d 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>
 2018-09-28 13:35:44 +02:00
dependabot[bot]
5da51771cd 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>
 2018-09-28 13:34:31 +02:00
dependabot[bot]
b6985482f7 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>
 2018-09-28 13:33:10 +02:00
dependabot[bot]
ec745b32de 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>
 2018-09-28 13:32:40 +02:00
dependabot[bot]
e046a987f6 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>
 2018-09-27 18:24:06 +02:00
dependabot[bot]
20a87b2c7f 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>
 2018-09-27 17:11:54 +02:00
dependabot[bot]
1cb8600a45 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>
 2018-09-27 17:11:29 +02:00
dependabot[bot]
42ab93c8b2 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>
 2018-09-27 14:59:15 +09:00
dependabot[bot]
7efa3d02c7 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>
 2018-09-27 02:11:21 +09:00
dependabot[bot]
65e7c6d9b5 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>
 2018-09-27 02:02:38 +09:00
dependabot[bot]
30342c865a 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>
 2018-09-26 15:06:05 +09:00
dependabot[bot]
3064917881 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>
 2018-09-26 14:50:02 +09:00
Grey Baker
6e075b9cc4 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>
 2018-09-26 04:27:53 +09:00
dependabot[bot]
8096df1055 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>
 2018-09-25 20:33:00 +02:00
dependabot[bot]
29e2d9e1b7 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>
 2018-09-25 20:32:37 +02:00
dependabot[bot]
d7f8e2ea41 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>
 2018-09-26 03:31:46 +09:00
dependabot[bot]
a7f75485d1 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>
 2018-09-25 20:31:40 +02:00
Eugen Rochko
56efc28189
Update ruby dependencies (#8743) 
* Update ffi to 1.9.25

* Update private_address_check to 0.5.0
 2018-09-21 00:42:59 +02:00
Thibaut Girka
91bef4759f 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
 2018-09-19 21:46:01 +02:00
Yamagishi Kazutoshi
0ddbccf7e6 Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
Alexander
64a5561b5a update devise_pam_authenticatable2, new feature: pam gets ip address of client (#8623) 2018-09-14 17:42:45 +02:00
Thibaut Girka
53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
 2018-08-27 18:09:28 +02:00
Eugen Rochko
c597249124
Add thor to Gemfile directly (#8467) 
It's a common dependency, but just in case
 2018-08-26 20:02:32 +02:00
Thibaut Girka
36393e1d2b 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.
 2018-08-26 14:23:24 +02:00
Alexander
cfe3cd58d6 fix pam authentication for certain hostnames (#8412) 2018-08-25 22:35:29 +02:00
Eugen Rochko
b37ae64578
Upgrade Doorkeeper to 5.0.0 (#8409) 
See doorkeeper-gem/doorkeeper#1137
 2018-08-24 18:17:11 +02:00
Thibaut Girka
8b4abaa90d Merge branch 'master' into glitch-soc/master 
Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.
 2018-08-21 18:24:48 +02:00
ThibG
f06fa09962 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
 2018-08-21 17:53:01 +02:00
ThibG
8ac5e651e1 Upgrade doorkeeper to 4.4.2 (#8321) 2018-08-20 22:42:02 +02:00
Thibaut Girka
88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-19 09:27:18 +02:00