d34b90c846
Bump puma from 4.3.2 to 4.3.3 ( #13177 )
...
This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
2020-03-01 22:25:13 +01:00
7e847c3f3c
Update puma from 4.3.2 to 4.3.3
...
Fixes #1294
This fixes cookies and devise authentication being broken as a result of
upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
2020-03-01 20:54:02 +01:00
97be4b34c5
Update glitch-soc-specific dependencies
...
- drop html2text which has been unused in a while
- update redcarpet
2020-02-29 22:32:33 +01:00
d46263b0f9
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-29 12:20:54 +01:00
dfadd78057
Fix elasticsearch-api and faraday incompatibilities ( #13166 )
2020-02-29 03:05:02 +01:00
0a969764c3
[Security] Bump puma from 4.3.1 to 4.3.2 ( #13167 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.1 to 4.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-29 02:57:14 +01:00
ea391ce8a1
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-25 14:28:13 +01:00
296828907c
Bump rack from 2.1.2 to 2.2.2 ( #13108 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.1.2 to 2.2.2.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.1.2...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-20 09:24:16 +09:00
8e8cce20c7
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-19 23:04:18 +01:00
2d1e769137
Bump simplecov from 0.18.1 to 0.18.2 ( #13106 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.18.1 to 0.18.2.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.18.1...v0.18.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-18 02:27:19 +09:00
79edec6f3a
Bump pkg-config from 1.4.0 to 1.4.1 ( #13105 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.0...1.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-18 02:24:20 +09:00
1d44123599
Bump nokogiri from 1.10.7 to 1.10.8 ( #13110 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.7 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-18 02:22:43 +09:00
8532bc72bd
Bump json-ld-preloaded from 3.0.6 to 3.1.0 ( #12982 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.6 to 3.1.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.6...3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 21:26:53 +09:00
f00064da6b
Bump rubocop-rails from 2.4.1 to 2.4.2 ( #12984 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 21:18:07 +09:00
0f1358f56e
Bump capybara from 3.30.0 to 3.31.0 ( #12983 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.30.0 to 3.31.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.30.0...3.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 20:51:14 +09:00
022c0c0d4f
Bump simplecov from 0.17.1 to 0.18.1 ( #13027 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.17.1 to 0.18.1.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.1...v0.18.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 20:46:25 +09:00
027fa11903
Bump pry-byebug from 3.7.0 to 3.8.0 ( #12985 )
...
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug ) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.7.0...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 20:46:05 +09:00
20f496a917
Bump letter_opener_web from 1.3.4 to 1.4.0 ( #13028 )
...
Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web ) from 1.3.4 to 1.4.0.
- [Release notes](https://github.com/fgrehm/letter_opener_web/releases )
- [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.3.4...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 20:28:22 +09:00
b89d5a7408
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `Gemfile.lock`:
We updated httplog in a separate commit.
Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
Upstream added better unsupported link stripping,
while we had different sanitizing configs.
Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
Strings unused in glitch-soc had been removed from
glitch-soc, reintroduced them even if they are not
useful, to reduce the risk of later merge conflicts.
2020-02-09 12:15:55 +01:00
6ad3b7bee1
Bump httplog from 1.4.1 to 1.4.2 ( #13059 )
2020-02-09 12:05:31 +01:00
36491cda49
update gemfile.lock for httplog 1.4.1
2020-02-09 09:49:28 +01:00
5839b108f2
Bump httplog from 1.4.0 to 1.4.1. ( #13051 )
...
httplog 1.4.0 is yanked.
2020-02-08 21:39:44 +01:00
fbf97961fc
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-28 19:15:03 +01:00
4e90375279
Fix Gemfile.lock ( #12995 )
...
* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues
* Fix deprecation warnings
* Fix Gemfile.lock
* More changes to catch Gemfile.lock issues
2020-01-28 18:50:44 +01:00
4533a6c264
Bump Rack from 2.0.8 to 2.1.2 ( #12991 )
...
* Update Gemfile
* Update Gemfile.lock
2020-01-28 15:23:16 +01:00
9604766a18
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
Upstream added code too close to glitch-soc-specific followers-hiding code.
Ported upstream changes.
2020-01-27 15:46:50 +01:00
da7c7cba19
Explicitly install rack gem ( #12972 )
...
Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`:
```
NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...>
```
2020-01-27 11:06:34 +01:00
6719b9daa5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream removed an unused function in code that has
been refactored a bit. Removed that function in the corresponding
places.
2020-01-20 18:31:11 +01:00
a2eba1aee3
Bump httplog from 1.3.3 to 1.4.0 ( #12902 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.3.3 to 1.4.0.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.3.3...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 23:45:10 +09:00
1f7e7594db
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `README.md`:
We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
Conflict due to glitch-soc theming system.
Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
Conflict due to glitch-soc theming system.
Adapted upstream changes.
- `yarn.lock`:
No real conflict, glitch-specific dependency too close to
an updated one. Adapted upstream change.
2020-01-20 15:00:22 +01:00
805af753a1
Bump parallel_tests from 2.30.0 to 2.30.1 ( #12901 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.30.0 to 2.30.1.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.30.0...v2.30.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 22:08:14 +09:00
00cbabf803
Bump faker from 2.10.0 to 2.10.1 ( #12899 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 21:37:26 +09:00
a1a8d02beb
Bump capistrano-rbenv from 2.1.4 to 2.1.6 ( #12898 )
...
Bumps [capistrano-rbenv](https://github.com/capistrano/rbenv ) from 2.1.4 to 2.1.6.
- [Release notes](https://github.com/capistrano/rbenv/releases )
- [Changelog](https://github.com/capistrano/rbenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/rbenv/compare/v2.1.4...v2.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 20:58:56 +09:00
25b073ae85
Bump webmock from 3.7.6 to 3.8.0 ( #12900 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.6 to 3.8.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.6...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 12:46:03 +01:00
5e9dd2dcbf
Bump i18n-tasks from 0.9.29 to 0.9.30 ( #12903 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.29 to 0.9.30.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.29...v0.9.30 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 12:45:23 +01:00
9c01f010ca
Bump oj from 3.10.0 to 3.10.1 ( #12897 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 12:43:52 +01:00
23fbcfcd85
Bump browser from 2.7.1 to 3.0.3 ( #12850 )
...
Bumps [browser](https://github.com/fnando/browser ) from 2.7.1 to 3.0.3.
- [Release notes](https://github.com/fnando/browser/releases )
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/browser/compare/v2.7.1...v3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-15 10:24:35 +09:00
fcf65e86bb
Remove derailed_benchmarks dependency ( #12861 )
2020-01-14 00:43:12 +01:00
9a88e4204d
Bump pg from 1.2.1 to 1.2.2 ( #12854 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.1...v1.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 03:09:31 +09:00
287bd7d4f9
Bump ox from 2.11.0 to 2.12.1 ( #12853 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.11.0 to 2.12.1.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.11.0...v2.12.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 03:02:20 +09:00
fec5a41721
Bump json-ld from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0 ( #12852 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from e742697a0906e74e8bb777ef98137bc3955d981d to 3.1.0. This release includes the previously tagged commit.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](e742697a09
2020-01-14 03:01:43 +09:00
89fc4613cb
Bump rubocop from 0.78.0 to 0.79.0 ( #12851 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.78.0 to 0.79.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.78.0...v0.79.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 02:58:56 +09:00
62e596b423
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-13 13:14:35 +01:00
99795c20e7
Bump rubocop-rails from 2.4.0 to 2.4.1 ( #12780 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13 02:53:57 +09:00
82e197787f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
No real conflict, glitch-soc-only dependency (redcarpet) too close to an
upstream one (rdf-normalize)
- `README.md`:
we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
Upstream added code to keep bookmarked statuses, we were already doing so
with slightly different code. Discarded upstream's changes.
- `package.json`:
No real conflict, glitch-soc-only dependency (favico.js) too close to
an upstream one
2020-01-12 15:57:34 +01:00
c297a1e7a7
Fix Ruby 2.7 support ( #12831 )
...
- update http gem to avoid errors
- update blurhash gem to avoid shared object loading error
- update goldfinger gem so the http gem could be updated
- update json gem to avoid warnings
2020-01-12 15:49:30 +01:00
f791cb2994
Remove ostatus2 gem from lockfile ( #12826 )
2020-01-12 03:13:01 +01:00
1b5314cd74
Update lockfile for #12800 ( #12825 )
2020-01-11 21:49:59 +01:00
96b43ad187
Remove dependency on OStatus2 gem ( #12822 )
2020-01-11 21:36:53 +01:00
7c29cd78b4
Bump rqrcode from 0.10.1 to 1.1.2 ( #12357 )
...
Bumps [rqrcode](https://github.com/whomwah/rqrcode ) from 0.10.1 to 1.1.2.
- [Release notes](https://github.com/whomwah/rqrcode/releases )
- [Commits](https://github.com/whomwah/rqrcode/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-11 19:51:04 +09:00
a709be3868
Bump rdf-normalize from 0.3.3 to 0.4.0 ( #12785 )
...
Bumps [rdf-normalize](https://github.com/gkellogg/rdf-normalize ) from 0.3.3 to 0.4.0.
- [Release notes](https://github.com/gkellogg/rdf-normalize/releases )
- [Commits](https://github.com/gkellogg/rdf-normalize/compare/0.3.3...0.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-11 07:02:16 +09:00
ffe8104398
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-07 16:28:59 +01:00
9a860a142b
Bump pg from 1.2.0 to 1.2.1 ( #12783 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.0...v1.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 23:52:23 +09:00
1f5eb27d50
Bump aws-sdk-s3 from 1.59.0 to 1.60.1 ( #12784 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.59.0 to 1.60.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.59.0...v1.60.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 23:03:05 +09:00
a7a89bf997
Bump bullet from 6.0.2 to 6.1.0 ( #12782 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 23:02:46 +09:00
332d252d00
Bump capybara from 3.29.0 to 3.30.0 ( #12781 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.29.0 to 3.30.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.29.0...3.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 22:56:04 +09:00
9852c25c95
Update lockfile for #12758 ( #12762 )
2020-01-05 02:25:07 +01:00
2591cedcad
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
Conflict due to theming system.
2020-01-04 23:04:42 +01:00
1e1db2c508
Gemfile Updates - Others ( #12761 )
...
* Update Gemfile.lock
* Update Gemfile
* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile
* Update Gemfile.lock
2020-01-04 22:48:57 +01:00
aea32f596c
Gemfile Updates - fixes warnings ( #12759 )
...
* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile
2020-01-04 22:48:18 +01:00
e0e067d569
Bump stackprof from 0.2.14 to 0.2.15 ( #12726 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.14 to 0.2.15.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.14...v0.2.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:23:05 +09:00
25134319e8
Bump pg from 1.1.4 to 1.2.0 ( #12725 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.1.4 to 1.2.0.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:21:51 +09:00
29c12522f0
Bump redis-namespace from 1.6.0 to 1.7.0 ( #12727 )
...
Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/resque/redis-namespace/releases )
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md )
- [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:16:45 +09:00
8ba7008cbd
Bump faker from 2.9.0 to 2.10.0 ( #12728 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:15:16 +09:00
a85b29d2e2
Bump derailed_benchmarks from 1.4.2 to 1.4.3 ( #12729 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases )
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md )
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.4.2...v1.4.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-31 00:13:25 +09:00
1356f0a8a3
Bump rack-cors from 1.1.0 to 1.1.1 ( #12730 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/cyu/rack-cors/releases )
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/cyu/rack-cors/compare/v1.1.0...v1.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 23:58:24 +09:00
c3e286a526
Circleci - Upgrade to Buster Images ( #12705 )
...
* Update config.yml
* Update Gemfile.lock
2019-12-29 17:00:43 +01:00
96d17e8437
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`
- `package.json`
2019-12-28 17:48:40 +01:00
8079a99f69
Bump rubocop from 0.77.0 to 0.78.0 ( #12677 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.77.0 to 0.78.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.77.0...v0.78.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-25 02:27:14 +09:00
de2082c658
Bump faker from 2.8.1 to 2.9.0 ( #12680 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.8.1 to 2.9.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.8.1...v2.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-25 02:25:14 +09:00
1963edc90c
Bump strong_migrations from 0.5.0 to 0.5.1 ( #12679 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.0...v0.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23 22:38:19 +01:00
36e2459806
Bump rails from 5.2.4 to 5.2.4.1 ( #12682 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.4 to 5.2.4.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.4...v5.2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23 22:37:35 +01:00
806ab00db8
Bump rack-attack from 6.2.1 to 6.2.2 ( #12681 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v6.2.1...v6.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23 22:36:06 +01:00
10bb570d84
Bump oj from 3.9.2 to 3.10.0 ( #12683 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.2 to 3.10.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.9.2...v3.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23 22:35:04 +01:00
fa4a92e340
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `config/locales/en.yml`
No real conflict, upstream added a translatable string “too close” to
one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
No real conflict, additional dependency in glitch-soc
2019-12-19 13:52:54 +01:00
031093e9ca
[Security] Bump rack from 2.0.7 to 2.0.8 ( #12654 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.0.7 to 2.0.8. **This update includes a security fix.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-19 07:21:51 +09:00
c9bb21aed0
Bump rails from 5.2.3 to 5.2.4 ( #12584 )
...
* Bump rails from 5.2.3 to 5.2.4
Bumps [rails](https://github.com/rails/rails ) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* sprockets ~> 3.7
2019-12-18 08:58:53 +09:00
89ae3ea278
Bump json-ld-preloaded from 3.0.4 to 3.0.6 ( #12361 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.4 to 3.0.6.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.4...3.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 04:04:30 +09:00
74c907d29c
Bump webpacker from 4.2.0 to 4.2.2 ( #12632 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v4.2.0...v4.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:53:15 +09:00
b547e5a3c8
Bump doorkeeper from 5.2.2 to 5.2.3 ( #12630 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.2...v5.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:36:49 +09:00
24c87fb84b
Bump stackprof from 0.2.13 to 0.2.14 ( #12631 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.13 to 0.2.14.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.13...v0.2.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:34:20 +09:00
c28e0efae4
Bump parallel_tests from 2.29.2 to 2.30.0 ( #12634 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.29.2 to 2.30.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.2...v2.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:32:51 +09:00
cf953596de
Bump faker from 2.8.0 to 2.8.1 ( #12633 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.8.0...v2.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-17 10:19:20 +09:00
bd7736b08b
[Security] Bump excon from 0.62.0 to 0.71.0 ( #12638 )
...
Bumps [excon](https://github.com/excon/excon ) from 0.62.0 to 0.71.0. **This update includes a security fix.**
- [Release notes](https://github.com/excon/excon/releases )
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt )
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-16 23:53:38 +01:00
dc173af0b9
Bump nokogiri from 1.10.5 to 1.10.7 ( #12586 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.5 to 1.10.7.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.5...v1.10.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-13 02:57:44 +09:00
d5a5056eba
Bump rubocop from 0.76.0 to 0.77.0 ( #12585 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.76.0 to 0.77.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.76.0...v0.77.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-13 02:57:32 +09:00
e859334b33
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
1e0801b45d
Bump aws-sdk-s3 from 1.57.0 to 1.59.0 ( #12581 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.57.0 to 1.59.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.57.0...v1.59.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:39:11 +09:00
f673e3d120
Bump strong_migrations from 0.4.2 to 0.5.0 ( #12583 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.4.2 to 0.5.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.4.2...v0.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 00:55:03 +01:00
0863d54a8c
Bump sidekiq-unique-jobs from 6.0.15 to 6.0.18 ( #12582 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.15 to 6.0.18.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.15...v6.0.18 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 00:52:43 +01:00
2cc60e8b09
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- package.json
Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-07 12:28:59 +01:00
af15853752
[Security] Bump puma from 4.2.0 to 4.3.1 ( #12559 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.2.0 to 4.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.2.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-06 19:44:09 +01:00
d10a8c7ee8
Bump faker from 2.7.0 to 2.8.0 ( #12531 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-03 02:38:17 +09:00
1d2cb53ef4
Bump brakeman from 4.7.1 to 4.7.2 ( #12530 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.1...v4.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-03 02:37:54 +09:00
78df875c99
Bump aws-sdk-s3 from 1.55.0 to 1.57.0 ( #12528 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.55.0 to 1.57.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.55.0...v1.57.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 23:03:46 +09:00
7075764baa
Bump tty-prompt from 0.19.0 to 0.20.0 ( #12529 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.19.0 to 0.20.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.19.0...v0.20.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 22:58:07 +09:00
1bdc5a20ea
Bump rubocop-rails from 2.3.2 to 2.4.0 ( #12532 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.2...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 22:56:53 +09:00
67415bbcf1
Bump fabrication from 2.20.2 to 2.21.0 ( #12527 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.20.2 to 2.21.0.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/compare/2.20.2...2.21.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 22:55:43 +09:00
e48f63787d
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-30 17:29:44 +01:00
2337455895
Bump net-ldap from 0.16.1 to 0.16.2 ( #12479 )
...
Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap ) from 0.16.1 to 0.16.2.
- [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases )
- [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc )
- [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.1...v0.16.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 21:33:20 +09:00
fa994d78dd
Bump parallel from 1.18.0 to 1.19.1 ( #12475 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.18.0 to 1.19.1.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.18.0...v1.19.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 20:49:19 +09:00
9c0deae4cc
Bump browser from 2.6.1 to 2.7.1 ( #12490 )
...
Bumps [browser](https://github.com/fnando/browser ) from 2.6.1 to 2.7.1.
- [Release notes](https://github.com/fnando/browser/releases )
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/browser/compare/v2.6.1...v2.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 13:19:27 +09:00
02ed19848e
Bump rack-cors from 1.0.6 to 1.1.0 ( #12477 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.0.6 to 1.1.0.
- [Release notes](https://github.com/cyu/rack-cors/releases )
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/cyu/rack-cors/compare/v1.0.6...v1.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:59:57 +09:00
a2a3f54beb
Bump browser from 2.6.1 to 2.7.0 ( #12476 )
...
Bumps [browser](https://github.com/fnando/browser ) from 2.6.1 to 2.7.0.
- [Release notes](https://github.com/fnando/browser/releases )
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/browser/compare/v2.6.1...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:54:40 +09:00
b0c9c62954
Bump charlock_holmes from 0.7.6 to 0.7.7 ( #12474 )
...
Bumps [charlock_holmes](https://github.com/brianmario/charlock_holmes ) from 0.7.6 to 0.7.7.
- [Release notes](https://github.com/brianmario/charlock_holmes/releases )
- [Commits](https://github.com/brianmario/charlock_holmes/compare/0.7.6...v0.7.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:53:50 +09:00
7c78c5142f
Bump pghero from 2.3.0 to 2.4.1 ( #12478 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.3.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 09:03:02 +09:00
d0be1d0cde
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-20 17:57:17 +01:00
1346774607
Bump webpacker from 4.0.7 to 4.2.0 ( #12416 )
...
* Bump webpacker from 4.0.7 to 4.2.0
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.0.7 to 4.2.0.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v4.0.7...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Use NODE_ENV=tests instead of test, to work around async modules not having a chunk
2019-11-20 17:56:11 +01:00
a96375d2ef
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
f650d29524
Bump aws-sdk-s3 from 1.52.0 to 1.55.0 ( #12419 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.52.0 to 1.55.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.52.0...v1.55.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:40:16 +09:00
89fa6c39f3
Bump derailed_benchmarks from 1.4.1 to 1.4.2 ( #12418 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases )
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md )
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.4.1...v1.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:40:04 +09:00
1b3a454023
Bump httplog from 1.3.2 to 1.3.3 ( #12420 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.3.2...v1.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:29:00 +09:00
fce9db69c9
Bump rack-attack from 6.1.0 to 6.2.1 ( #12421 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.1.0 to 6.2.1.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v6.1.0...v6.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:26:08 +09:00
4f057ce7e6
Bump doorkeeper from 5.2.1 to 5.2.2 ( #12417 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.1...v5.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:13:23 +09:00
ca186a0455
[Security] Bump nokogiri from 1.10.4 to 1.10.5 ( #12404 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.4 to 1.10.5. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 09:15:30 +09:00
b91414e880
[Security] Bump rack-cors from 1.0.3 to 1.0.6 ( #12395 )
...
Bumps [rack-cors](https://github.com/cyu/rack-cors ) from 1.0.3 to 1.0.6. **This update includes a security fix.**
- [Release notes](https://github.com/cyu/rack-cors/releases )
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/cyu/rack-cors/compare/v1.0.3...v1.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-15 21:51:42 +01:00
40f5df1fd7
Bump parallel from 1.17.0 to 1.18.0 ( #12358 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.17.0...v1.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:43:43 +09:00
ec51b4c947
Bump rubocop from 0.75.1 to 0.76.0 ( #12355 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.75.1 to 0.76.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.75.1...v0.76.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:42:50 +09:00
151d157a5d
Bump faker from 2.6.0 to 2.7.0 ( #12354 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:38:07 +09:00
b6a81e6b3b
Bump annotate from 3.0.2 to 3.0.3 ( #12359 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.2...v3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:37:34 +09:00
45092bbb08
Bump stoplight from 2.1.3 to 2.2.0 ( #12360 )
...
Bumps [stoplight](https://github.com/orgsync/stoplight ) from 2.1.3 to 2.2.0.
- [Release notes](https://github.com/orgsync/stoplight/releases )
- [Changelog](https://github.com/orgsync/stoplight/blob/master/CHANGELOG.md )
- [Commits](https://github.com/orgsync/stoplight/compare/v2.1.3...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:34:48 +09:00
5f4a2b0d32
Bump fuubar from 2.4.1 to 2.5.0 ( #12356 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.4.1...releases/v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:05:16 +09:00
5af865b2ab
[Security] Bump brakeman from 4.6.1 to 4.7.1 ( #12329 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.6.1 to 4.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.6.1...v4.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-08 14:45:42 +09:00
e7655951d7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
84a2c5cff9
Bump aws-sdk-s3 from 1.48.0 to 1.52.0 ( #12250 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.48.0 to 1.52.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.48.0...v1.52.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:58:11 +09:00
482b41468c
Bump annotate from 2.7.5 to 3.0.2 ( #12100 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 2.7.5 to 3.0.2.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc )
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.5...v3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:04:00 +09:00
3cddf475fa
[Security] Bump simple_form from 4.1.0 to 5.0.1 ( #12099 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 4.1.0 to 5.0.1. **This update includes a security fix.**
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.1.0...v5.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:00:41 +09:00
238f9fc32b
Bump rspec-rails from 3.8.2 to 3.9.0 ( #12241 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 19:40:52 +09:00
2f6c1cb097
Bump strong_migrations from 0.4.1 to 0.4.2 ( #12242 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.4.1 to 0.4.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.4.1...v0.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 10:55:56 +09:00
a47558a243
Bump active_record_query_trace from 1.6.2 to 1.7 ( #12243 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6.2 to 1.7.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.2...v1.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 10:55:07 +09:00
eaa085b063
Bump pkg-config from 1.3.9 to 1.4.0 ( #12239 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.3.9 to 1.4.0.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.3.9...1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:48:08 +09:00
114edcf560
Bump faker from 2.5.0 to 2.6.0 ( #12244 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.5.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:47:14 +09:00
e76f4056e5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
e076a00029
[Security] Bump loofah from 2.2.3 to 2.3.1 ( #12203 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.3 to 2.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-24 14:49:09 +09:00
be6bf3f097
Bump oj from 3.9.1 to 3.9.2 ( #12104 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.9.1...v3.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 01:35:40 +09:00
0caa903ced
Bump stackprof from 0.2.12 to 0.2.13 ( #12103 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.12 to 0.2.13.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.12...v0.2.13 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 01:33:59 +09:00
b4f9033eb5
Bump sidekiq-unique-jobs from 6.0.13 to 6.0.15 ( #12102 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.13 to 6.0.15.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.13...v6.0.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 01:32:18 +09:00
d578c6cfd4
Bump derailed_benchmarks from 1.4.0 to 1.4.1 ( #12101 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases )
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md )
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.4.0...v1.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 23:45:02 +09:00
cd317acb71
Bump rubocop from 0.74.0 to 0.75.1 ( #12191 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.74.0 to 0.75.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.74.0...v0.75.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 23:43:49 +09:00
9506d9cafc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
07abea7ba8
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
9fa40f1f0a
Bump capistrano from 3.11.1 to 3.11.2 ( #12012 )
...
* Bump capistrano from 3.11.1 to 3.11.2
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.1...v3.11.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Bump capistrano from 3.11.1 to 3.11.2
2019-10-04 11:11:36 +09:00
bbf15e78ba
Bump pkg-config from 1.3.8 to 1.3.9 ( #12011 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.3.8 to 1.3.9.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.3.8...1.3.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:23:55 +09:00
29d2d28119
Bump faker from 2.4.0 to 2.5.0 ( #12010 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:21:56 +09:00
0737180a83
Bump tty-command from 0.8.2 to 0.9.0 ( #12009 )
...
Bumps [tty-command](https://github.com/piotrmurach/tty-command ) from 0.8.2 to 0.9.0.
- [Release notes](https://github.com/piotrmurach/tty-command/releases )
- [Changelog](https://github.com/piotrmurach/tty-command/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-command/compare/v0.8.2...v0.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:19:54 +09:00
66a903d1ad
Bump webmock from 3.7.5 to 3.7.6 ( #12008 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.5 to 3.7.6.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.5...v3.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:19:18 +09:00
ac7c1fb62c
Bump derailed_benchmarks from 1.3.6 to 1.4.0 ( #12007 )
...
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks ) from 1.3.6 to 1.4.0.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases )
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md )
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.3.6...v1.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:18:58 +09:00
0baf951700
Bump patch level of Ruby ( #12070 )
...
Cosmetic change: patch level for the released 2.6.5 is p114.
2019-10-03 21:06:55 +02:00
c2d6ef1b64
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
38d2632b90
Add parallelization to `tootctl search deploy` ( #12051 )
...
* Add parallel gem
* Modify parallel option in tootctl search deploy
* Add paralell option to tootctl search deploy
* Change 1 to false
* Clean up
* Rename --parallel to --processes
2019-10-02 21:50:43 +02:00
216594fe26
Use Ruby 2.6.5 ( #12049 )
2019-10-02 04:54:32 +02:00
cc94c90bf1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
fe3de62124
Use Ruby-2.6.4 ( #11942 )
2019-09-25 02:07:11 +02:00
161b0a0958
Hide error message on /heath ( #11947 )
...
* Hide error message on /heath
* update health_check
2019-09-24 20:28:25 +02:00
aa6911a605
Bump puma from 4.1.1 to 4.2.0 ( #11939 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 15:39:11 +02:00
90f8e64e0a
Bump doorkeeper from 5.2.0 to 5.2.1 ( #11934 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.0...v5.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 20:05:40 +09:00
fd1efcaeac
Bump webmock from 3.7.3 to 3.7.5 ( #11936 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.3 to 3.7.5.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.3...v3.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:54:25 +09:00
4d2b257240
Bump simplecov from 0.17.0 to 0.17.1 ( #11932 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:53:09 +09:00
3be4ee3a63
Bump chewy from 5.0.0 to 5.0.1 ( #11935 )
...
Bumps [chewy](https://github.com/toptal/chewy ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/toptal/chewy/releases )
- [Changelog](https://github.com/toptal/chewy/blob/master/CHANGELOG.md )
- [Commits](https://github.com/toptal/chewy/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:52:29 +09:00
3adb0ad5ab
Bump redis from 4.1.2 to 4.1.3 ( #11938 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/redis/redis-rb/releases )
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.2...v4.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:48:03 +09:00
7d821c828f
Bump faker from 2.3.0 to 2.4.0 ( #11933 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.3.0...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:25:59 +09:00
5ce267efd0
Bump doorkeeper from 5.1.0 to 5.2.0 ( #11856 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.1.0...v5.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-20 02:19:12 +09:00
4837d6275a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
605b78c717
Bump capybara from 3.28.0 to 3.29.0 ( #11854 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.28.0 to 3.29.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.28.0...3.29.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 16:12:30 +02:00
f31ee4685c
Bump webmock from 3.7.1 to 3.7.3 ( #11853 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.1 to 3.7.3.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.1...v3.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 14:30:29 +02:00
b02f5b9463
Bump tzinfo-data from 1.2019.2 to 1.2019.3 ( #11857 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2019.2 to 1.2019.3.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.2...v1.2019.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 14:29:44 +02:00
3f69dab8e0
Bump faker from 2.2.2 to 2.3.0 ( #11858 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.2 to 2.3.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.2...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 14:29:29 +02:00
85afa898cd
Bump puma from 4.1.0 to 4.1.1 ( #11855 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.1.0...v4.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 14:25:37 +02:00
f86b585390
Revert "Bump webpush from 0.3.8 to 1.0.0 ( #11614 )" ( #11840 )
...
This reverts commit c812a03e00
2019-09-14 10:36:10 +02:00
2e38d889a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
666c1a8a06
Change tootctl to use inline parallelization instead of Sidekiq ( #11776 )
...
- Remove --background option
- Add --concurrency(=5) option
- Add progress bars
2019-09-10 13:48:48 +02:00
c812a03e00
Bump webpush from 0.3.8 to 1.0.0 ( #11614 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.8 to 1.0.0.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.8...v1.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-10 12:44:47 +02:00
e3b216b2d8
Bump fastimage from 2.1.5 to 2.1.7 ( #11785 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.1.5 to 2.1.7.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.5...v2.1.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:10:17 +09:00
0dc9d8f95d
Bump sanitize from 5.0.0 to 5.1.0 ( #11786 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.0.0...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:08:45 +09:00
3ab5be74af
Bump mime-types from 3.2.2 to 3.3 ( #11788 )
...
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types ) from 3.2.2 to 3.3.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases )
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md )
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.2.2...v3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:03:07 +09:00
a019318f94
Bump json-ld-preloaded from 3.0.3 to 3.0.4 ( #11790 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.3...3.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 19:52:33 +09:00
9c1b1e9ca1
Bump oj from 3.9.0 to 3.9.1 ( #11789 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 19:50:38 +09:00
5265487ea0
Bump faker from 2.2.1 to 2.2.2 ( #11787 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.2.1...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 19:49:54 +09:00
4b6bf21161
Bump devise from 4.7.0 to 4.7.1 ( #11784 )
...
* Bump devise from 4.7.0 to 4.7.1
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.0...v4.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* bcrypt (3.1.12)
2019-09-09 19:49:13 +09:00
7544167f3c
Add healthcheck endpoint for web ( #11770 )
2019-09-07 02:47:51 +02:00
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
41152c7b99
Bump addressable from 2.6.0 to 2.7.0 ( #11732 )
...
Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.6.0...addressable-2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 12:31:47 +09:00
7599b4b3b6
Bump capistrano from 3.11.0 to 3.11.1 ( #11731 )
...
* Bump capistrano from 3.11.0 to 3.11.1
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* 3.11.1
2019-09-05 12:04:45 +09:00
17bb2b5e06
Bump aws-sdk-s3 from 1.46.0 to 1.48.0 ( #11729 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.46.0 to 1.48.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.46.0...v1.48.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:46:37 +09:00
3d1a8d1eca
Bump rubocop-rails from 2.3.1 to 2.3.2 ( #11728 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:45:44 +09:00
decfba58ab
Bump bootsnap from 1.4.4 to 1.4.5 ( #11730 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.4...v1.4.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:45:20 +09:00
908db96571
Bump faker from 2.1.2 to 2.2.1 ( #11733 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.2...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:44:01 +09:00
645f9ffe45
Bump webmock from 3.6.2 to 3.7.1 ( #11734 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.2 to 3.7.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.2...v3.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:42:35 +09:00
741b53651e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
2019-08-30 13:38:41 +02:00
02fff98491
Fix JSON-LD deprecation warning in log output ( #11699 )
2019-08-30 01:34:21 +02:00
9cd6783781
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 20:53:51 +02:00
b3141d0585
Revert bcrypt to 3.1.12, again ( #11693 )
...
Same reasons as in #11555
2019-08-29 20:51:30 +02:00
449a0727a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb
All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
196ad08e2d
Bump bullet from 6.0.1 to 6.0.2 ( #11666 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.1...6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 23:05:19 +09:00
244a0e61c0
Bump devise from 4.6.2 to 4.7.0 ( #11667 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.6.2 to 4.7.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.2...v4.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 23:04:52 +09:00
2a1e43dffc
Bump rubocop-rails from 2.3.0 to 2.3.1 ( #11665 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 22:46:09 +09:00
32c781ec6b
Add soft delete for statuses for instant deletes through API ( #11623 )
...
* Add soft delete for statuses to allow them to appear instant
* Allow reporting soft-deleted statuses and show them in the admin UI
* Change index for getting an account's statuses
2019-08-22 21:55:56 +02:00
c060523dc2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
e849d13fba
Bump pkg-config from 1.3.7 to 1.3.8 ( #11616 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.7...1.3.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-20 01:49:40 +09:00
07fbf5d1d8
Bump simple-navigation from 4.0.5 to 4.1.0 ( #11617 )
...
Bumps [simple-navigation](https://github.com/codeplant/simple-navigation ) from 4.0.5 to 4.1.0.
- [Release notes](https://github.com/codeplant/simple-navigation/releases )
- [Changelog](https://github.com/codeplant/simple-navigation/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeplant/simple-navigation/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-20 01:49:17 +09:00
83e00255d2
Bump pghero from 2.2.1 to 2.3.0 ( #11615 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.2.1...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:37:22 +09:00
7b04ef05c3
Bump pundit from 2.0.1 to 2.1.0 ( #11613 )
...
Bumps [pundit](https://github.com/varvet/pundit ) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:36:45 +09:00
05588491a3
Bump rubocop-rails from 2.2.1 to 2.3.0 ( #11612 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.1...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:34:30 +09:00
eab02d822e
Bump oj from 3.8.1 to 3.9.0 ( #11611 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.8.1 to 3.9.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.8.1...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-19 22:32:28 +09:00
8aba819ed2
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 18:01:21 +02:00
c656426415
Revert bcrypt to 3.1.12 ( #11555 )
2019-08-12 17:52:12 +02:00
f0362fa0ee
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 16:24:22 +02:00
b977373304
Bump parallel_tests from 2.29.1 to 2.29.2 ( #11549 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.1...v2.29.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:14:22 +09:00
e7188e0cce
Bump devise-two-factor from 3.0.3 to 3.1.0 ( #11550 )
...
Bumps [devise-two-factor](https://github.com/tinfoil/devise-two-factor ) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/tinfoil/devise-two-factor/releases )
- [Changelog](https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tinfoil/devise-two-factor/compare/v3.0.3...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:11:55 +09:00
f07af657fa
Bump puma from 4.0.1 to 4.1.0 ( #11548 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.0.1...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:11:18 +09:00
59d6720a90
Bump faker from 2.1.0 to 2.1.2 ( #11547 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.0...v2.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:10:16 +09:00
1fdf24925a
[Security] Bump nokogiri from 1.10.3 to 1.10.4 ( #11540 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-11 23:48:56 +02:00
ff76f6de4f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
ed9245d6b2
Bump faker from 1.9.6 to 2.1.0 and update faker api ( #11489 )
...
* Bump faker from 1.9.6 to 2.1.0
Bumps [faker](https://github.com/stympy/faker ) from 1.9.6 to 2.1.0.
- [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/1.9.6...v2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Use faker api v2
https://github.com/stympy/faker/releases/tag/2.0
2019-08-06 15:33:03 +02:00
77416866a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-05 13:13:28 +02:00
f5512700c1
Bump rubocop from 0.73.0 to 0.74.0 ( #11486 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.73.0 to 0.74.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.73.0...v0.74.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 18:53:30 +09:00
a77360aea1
Bump webmock from 3.6.0 to 3.6.2 ( #11488 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.0 to 3.6.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.6.0...v3.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 18:52:57 +09:00
44c1447b2b
Bump dotenv-rails from 2.7.4 to 2.7.5 ( #11487 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.4...v2.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 18:42:51 +09:00
a2d17b1fb3
Bump capybara from 3.27.0 to 3.28.0 ( #11484 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.27.0 to 3.28.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.27.0...3.28.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 18:25:40 +09:00
4973ba2d1f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
b9c4632db3
let bundler fetch http_parser.rb submodules ( #11444 )
2019-07-29 20:42:04 +02:00
ef5debb7a7
Bump oj from 3.8.0 to 3.8.1 ( #11435 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 22:51:03 +09:00
4de9652624
Bump capybara from 3.26.0 to 3.27.0 ( #11437 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.26.0 to 3.27.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.26.0...3.27.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 22:48:56 +09:00
569c7dfaed
Bump httplog from 1.3.1 to 1.3.2 ( #11436 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.3.1...v1.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 22:39:54 +09:00
ec28e1e11d
Bump brakeman from 4.5.1 to 4.6.1 ( #11438 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.5.1 to 4.6.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.5.1...v4.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 22:37:02 +09:00
1c59a60760
Bump aws-sdk-s3 from 1.45.0 to 1.46.0 ( #11439 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.45.0 to 1.46.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.45.0...v1.46.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 22:29:17 +09:00
6c7a3268c9
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
1cf7bdede4
Bump json-ld-preloaded from 3.0.2 to 3.0.3 ( #11316 )
...
* Bump json-ld-preloaded from 3.0.2 to 3.0.3
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.2...3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* use json-ld edge
2019-07-28 13:48:43 +02:00
9c617b3b3a
Add search syntax for operators and phrases ( #11411 )
2019-07-27 04:42:08 +02:00
124a1d3880
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-24 16:23:53 +02:00
884e20c028
Bump active_model_serializers from 0.10.9 to 0.10.10 ( #11311 )
...
* Bump active_model_serializers from 0.10.9 to 0.10.10
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.9 to 0.10.10.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.10/CHANGELOG.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...v0.10.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Add root option to render method
2019-07-23 11:10:42 +02:00
579ccb0bb9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
adbe5310fa
Bump browser from 2.5.3 to 2.6.1 ( #11388 )
...
Bumps [browser](https://github.com/fnando/browser ) from 2.5.3 to 2.6.1.
- [Release notes](https://github.com/fnando/browser/releases )
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/browser/compare/v2.5.3...v2.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 23:11:01 +09:00
c7f90215b1
Bump oj from 3.7.12 to 3.8.0 ( #11387 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.12 to 3.8.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.12...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 23:07:42 +09:00
fe26f82cca
Bump rubocop from 0.72.0 to 0.73.0 ( #11384 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.72.0 to 0.73.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.72.0...v0.73.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 23:06:34 +09:00
43a34ed422
Bump premailer-rails from 1.10.2 to 1.10.3 ( #11386 )
...
Bumps [premailer-rails](https://github.com/fphilipe/premailer-rails ) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/fphilipe/premailer-rails/releases )
- [Changelog](https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fphilipe/premailer-rails/compare/v1.10.2...v1.10.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 23:05:34 +09:00
179bb74f47
Bump capybara from 3.25.0 to 3.26.0 ( #11385 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.25.0 to 3.26.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.25.0...3.26.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 23:04:17 +09:00
eecce7e59b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
2fe3965d17
Bump strong_migrations from 0.4.0 to 0.4.1 ( #11307 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.4.0 to 0.4.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.4.0...v0.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-20 01:08:02 +09:00
020daac19f
Bump rack-attack from 6.0.0 to 6.1.0 ( #11313 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v6.0.0...v6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18 01:07:02 +02:00
b856854767
Bump rubocop-rails from 2.2.0 to 2.2.1 ( #11308 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.0...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18 01:06:39 +02:00
f4ecf3c821
Bump puma from 3.12.1 to 4.0.1 ( #11306 )
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.1 to 4.0.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.12.1...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-18 01:06:14 +02:00
838b0e2e5f
Bump rubocop-rails from 2.0.1 to 2.2.0 ( #11257 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.0.1 to 2.2.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.0.1...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
c4a6b6568f
Bump faker from 1.9.3 to 1.9.6 ( #11259 )
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.3 to 1.9.6.
- [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.9.3...1.9.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
083d89b455
Bump simplecov from 0.16.1 to 0.17.0 ( #11260 )
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.16.1...v0.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
e821966494
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
517123911c
Bump tzinfo-data from 1.2019.1 to 1.2019.2 ( #11258 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2019.1 to 1.2019.2.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.1...v1.2019.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 00:48:50 +02:00
852b0a9765
Update fuubar dependency to 2.4.1 ( #11248 )
...
See also: thekompanee/fuubar#111
2019-07-15 00:48:49 +02:00
4338666b5f
Bump rubocop-rails from 2.0.1 to 2.2.0 ( #11257 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.0.1 to 2.2.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.0.1...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-13 23:52:08 +09:00
f70b20a01c
Add a spam check ( #11217 )
...
* Add a spam check
* Use Nilsimsa to generate locality-sensitive hashes and compare using Levenshtein distance
* Add more tests
* Add exemption when the message is a reply to something that mentions the sender
* Use Nilsimsa Compare Value instead of Levenshtein distance
* Use MD5 for messages shorter than 10 characters
* Add message to automated report, do not add non-public statuses to
automated report, add trust level to accounts and make unsilencing
raise the trust level to prevent repeated spam checks on that account
* Expire spam check data after 3 months
* Add support for local statuses, reduce expiration to 1 week, always create a report
* Add content warnings to the spam check and exempt empty statuses
* Change Nilsimsa threshold to 95 and make sure removed statuses are removed from the spam check
* Add all matched statuses into automatic report
2019-07-13 16:45:50 +02:00
ThibG