23978df143
Bump aws-sdk-s3 from 1.43.0 to 1.45.0 ( #11262 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.43.0 to 1.45.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.43.0...v1.45.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
6ab84c12a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-04 16:21:39 +02:00
0d9ffe56fb
Add request pool to improve delivery performance ( #10353 )
...
* Add request pool to improve delivery performance
Fix #7909
* Ensure connection is closed when exception interrupts execution
* Remove Timeout#timeout from socket connection
* Fix infinite retrial loop on HTTP::ConnectionError
* Close sockets on failure, reduce idle time to 90 seconds
* Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server
* Use a shared pool size, 512 by default, to stay below open file limit
* Add some tests
* Add more tests
* Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds
* Use a shared pool that returns preferred connection but re-purposes other ones when needed
* Fix wrong connection being returned on subsequent calls within the same thread
* Reduce mutex calls on flushes from 2 to 1 and add test for reaping
2019-07-02 00:34:38 +02:00
13f54f41ad
Bump rubocop from 0.71.0 to 0.72.0 ( #11229 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.71.0 to 0.72.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.71.0...v0.72.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-01 22:36:45 +09:00
ffb6da8b78
Bump capybara from 3.24.0 to 3.25.0 ( #11225 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.24.0 to 3.25.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.24.0...3.25.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-01 22:34:51 +09:00
aaec64a500
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
1afb8cac2f
Bump aws-sdk-s3 from 1.42.0 to 1.43.0 ( #11172 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.42.0 to 1.43.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.42.0...v1.43.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-25 22:45:32 +09:00
356e9150df
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/lib/sanitize_config.rb
Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
2019-06-19 18:36:16 +02:00
54438042f1
Bump capybara from 3.22.0 to 3.24.0 ( #11100 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.22.0 to 3.24.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.22.0...3.24.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17 23:23:13 +09:00
9639a7f87a
Bump ox from 2.10.1 to 2.11.0 ( #11101 )
...
Bumps ox from 2.10.1 to 2.11.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17 22:50:20 +09:00
f4539845e0
Bump webmock from 3.5.1 to 3.6.0 ( #11031 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.5.1...v3.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17 21:17:45 +09:00
f765cd97b2
Bump aws-sdk-s3 from 1.41.0 to 1.42.0 ( #11030 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.41.0 to 1.42.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.41.0...v1.42.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17 21:15:33 +09:00
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
70423ce81f
require rubocop-rails in .rubocop.yml ( #10974 )
...
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965 )"
This reverts commit 121d19d7fa
2019-06-06 12:31:48 +02:00
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
121d19d7fa
Revert #10957 (rubocop-rails) which is incompatible with CodeClimate ( #10965 )
2019-06-04 19:35:19 +02:00
3e56f95c73
Replace from scss-lint to sass-lint ( #10958 )
2019-06-04 17:23:18 +02:00
3f536f06d6
Use rubocop-rails ( #10957 )
2019-06-04 15:25:52 +02:00
c11742dd9b
Bump fuubar from 2.3.2 to 2.4.0 ( #10947 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.2...releases/v2.4.0 )
2019-06-04 14:15:32 +09:00
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
5677172d86
Bump rubocop from 0.70.0 to 0.71.0 ( #10901 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.70.0 to 0.71.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.70.0...v0.71.0 )
2019-05-30 23:17:54 +09:00
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-30 13:31:01 +02:00
dee4f1878d
Bump aws-sdk-s3 from 1.40.0 to 1.41.0 ( #10892 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.40.0 to 1.41.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.40.0...v1.41.0 )
2019-05-30 12:58:22 +09:00
fa48cf96de
Bump capybara from 3.21.0 to 3.22.0 ( #10893 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.21.0 to 3.22.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.21.0...3.22.0 )
2019-05-30 09:37:11 +09:00
26e290ae64
Bump strong_migrations from 0.3.1 to 0.4.0 ( #10871 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.3.1 to 0.4.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.3.1...v0.4.0 )
2019-05-29 18:22:59 +09:00
61ab5b0c83
Bump capybara from 3.20.2 to 3.21.0 ( #10854 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.20.2 to 3.21.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.20.2...3.21.0 )
2019-05-29 11:21:22 +09:00
0b1c7150da
Bump tty-prompt from 0.18.1 to 0.19.0 ( #10870 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.18.1 to 0.19.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.18.1...v0.19.0 )
2019-05-29 11:10:24 +09:00
c0dc247bce
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
ce8de3a6e5
Bump aws-sdk-s3 from 1.39.0 to 1.40.0 ( #10803 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.39.0 to 1.40.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.39.0...v1.40.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-22 22:31:05 +09:00
bc23de458e
Bump rubocop from 0.69.0 to 0.70.0 ( #10802 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.69.0 to 0.70.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.69.0...v0.70.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-22 22:09:10 +09:00
4d65740663
Bump httplog from 1.2.2 to 1.3.0 ( #10795 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/commits/v1.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-21 15:41:15 +09:00
6e227ecb04
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-18 10:04:32 +02:00
94aef563b9
Add support for markdown-formatted toots
2019-05-17 23:51:14 +02:00
e976a9dfbd
Bump aws-sdk-s3 from 1.38.0 to 1.39.0 ( #10773 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.38.0 to 1.39.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.38.0...v1.39.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-17 15:23:21 +09:00
2310dd40fa
Bump capybara from 3.19.1 to 3.20.0 ( #10768 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.19.1 to 3.20.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.19.1...3.20.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-16 16:13:52 +09:00
90093f1795
Bump aws-sdk-s3 from 1.36.1 to 1.38.0 ( #10769 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.36.1 to 1.38.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.36.1...v1.38.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-16 15:00:24 +09:00
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
76901b65c4
Bump capybara from 3.18.0 to 3.19.1 ( #10758 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.18.0 to 3.19.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.18.0...3.19.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-14 15:01:47 +09:00
d90104204f
Bump rubocop from 0.68.1 to 0.69.0 ( #10762 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.1 to 0.69.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.68.1...v0.69.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-14 15:00:58 +09:00
68629f2773
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
7e73a8b8bf
Bump parallel_tests from 2.28.0 to 2.29.0 ( #10716 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-06 15:12:55 +09:00
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
ecbea2e3c6
Bump rack-attack from 5.4.2 to 6.0.0 ( #10599 )
...
* Bump rack-attack from 5.4.2 to 6.0.0
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 5.4.2 to 6.0.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.2...v6.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
* fix payload[:request]
2019-05-03 16:16:11 +02:00
61e28b0ccc
Bump scss_lint from 0.57.1 to 0.58.0 ( #10678 )
...
Bumps [scss_lint](https://github.com/sds/scss-lint ) from 0.57.1 to 0.58.0.
- [Release notes](https://github.com/sds/scss-lint/releases )
- [Changelog](https://github.com/sds/scss-lint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sds/scss-lint/compare/v0.57.1...v0.58.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-03 17:29:53 +09:00
7c94b190c8
Bump bullet from 5.9.0 to 6.0.0 ( #10635 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.9.0 to 6.0.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.9.0...6.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-30 18:05:49 +02:00
feff0fc9b2
Bump rubocop from 0.67.2 to 0.68.0 ( #10654 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.67.2 to 0.68.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.67.2...v0.68.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-30 18:05:22 +02:00
fba96c808d
Add blurhash ( #10630 )
...
* Add blurhash
* Use fallback color for spoiler when blurhash missing
* Federate the blurhash and accept it as long as it's at most 5x5
* Display unknown media attachments as blurhash placeholders
* Improve style of embed actions and spoiler button
* Change blurhash resolution from 3x3 to 4x4
* Improve dependency definitions
* Fix code style issues
2019-04-27 03:24:09 +02:00
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +02:00
db61383f82
Bump capybara from 3.17.0 to 3.18.0 ( #10626 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.17.0 to 3.18.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.17.0...3.18.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-23 18:53:52 +09:00
703cdf2a0c
Bump capybara from 3.16.2 to 3.17.0 ( #10602 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.2 to 3.17.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.16.2...3.17.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-23 00:54:51 +02:00
dependabot-preview[bot]
Thibaut Girka
Eugen Rochko
dependabot-preview[bot]
Yamagishi Kazutoshi
dependabot[bot]