Eugen Rochko
0d62e09707
Fix failing jest test ( #13681 )
2020-05-08 21:21:57 +02:00
ThibG
f1e0fa80f6
Fix own following/followers not showing muted users ( #13614 )
...
Fixes #13612
2020-05-08 20:36:34 +02:00
dependabot-preview[bot]
043255a45e
Bump rubocop from 0.79.0 to 0.82.0 ( #13677 )
...
* Bump rubocop from 0.79.0 to 0.82.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.79.0 to 0.82.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.79.0...v0.82.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Update .codeclimate.yml
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-05-08 20:24:26 +02:00
Eugen Rochko
5892e8175a
Fix migrations failing due to strong-migrations update ( #13680 )
2020-05-08 20:23:16 +02:00
Taras Gogol
6748a5acb1
Fix followings list order | Issue #13538 ( #13676 )
2020-05-08 20:17:16 +02:00
dependabot-preview[bot]
1787dc2721
Bump jest from 24.9.0 to 25.4.0 ( #13517 )
...
Bumps [jest](https://github.com/facebook/jest ) from 24.9.0 to 25.4.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v24.9.0...v25.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:56:07 +02:00
dependabot-preview[bot]
50188d3212
Bump net-ssh from 5.2.0 to 6.0.2 ( #13555 )
...
Bumps [net-ssh](https://github.com/net-ssh/net-ssh ) from 5.2.0 to 6.0.2.
- [Release notes](https://github.com/net-ssh/net-ssh/releases )
- [Changelog](https://github.com/net-ssh/net-ssh/blob/master/CHANGES.txt )
- [Commits](https://github.com/net-ssh/net-ssh/compare/v5.2.0...v6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:53:37 +02:00
dependabot-preview[bot]
26e8deec74
Bump net-scp from 2.0.0 to 3.0.0 ( #13601 )
...
Bumps [net-scp](https://github.com/net-ssh/net-scp ) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/net-ssh/net-scp/releases )
- [Changelog](https://github.com/net-ssh/net-scp/blob/master/CHANGES.txt )
- [Commits](https://github.com/net-ssh/net-scp/compare/v2.0.0...v3.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:53:11 +02:00
dependabot-preview[bot]
c38c13b204
Bump pry-byebug from 3.8.0 to 3.9.0 ( #13653 )
...
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug ) from 3.8.0 to 3.9.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.8.0...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:52:57 +02:00
dependabot-preview[bot]
96cdc9fa38
Bump parser from 2.7.1.1 to 2.7.1.2 ( #13618 )
...
Bumps [parser](https://github.com/whitequark/parser ) from 2.7.1.1 to 2.7.1.2.
- [Release notes](https://github.com/whitequark/parser/releases )
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.1...v2.7.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:52:18 +02:00
dependabot-preview[bot]
427a635df9
Bump capybara from 3.31.0 to 3.32.1 ( #13641 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.31.0 to 3.32.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.31.0...3.32.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:51:49 +02:00
dependabot-preview[bot]
c6c83df344
Bump fugit from 1.3.3 to 1.3.5 ( #13634 )
...
Bumps [fugit](https://github.com/floraison/fugit ) from 1.3.3 to 1.3.5.
- [Release notes](https://github.com/floraison/fugit/releases )
- [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/floraison/fugit/compare/v1.3.3...v1.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:51:36 +02:00
dependabot-preview[bot]
228518214a
Bump byebug from 11.1.1 to 11.1.3 ( #13625 )
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.1.1 to 11.1.3.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.1...v11.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:50:57 +02:00
dependabot-preview[bot]
a513124f78
Bump tzinfo-data from 1.2019.3 to 1.2020.1 ( #13645 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2019.3 to 1.2020.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.3...v1.2020.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:50:36 +02:00
dependabot-preview[bot]
33bfb8539e
Bump launchy from 2.4.3 to 2.5.0 ( #13628 )
...
Bumps [launchy](https://github.com/copiousfreetime/launchy ) from 2.4.3 to 2.5.0.
- [Release notes](https://github.com/copiousfreetime/launchy/releases )
- [Changelog](https://github.com/copiousfreetime/launchy/blob/master/README.md )
- [Commits](https://github.com/copiousfreetime/launchy/compare/v2.4.3...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:50:15 +02:00
dependabot-preview[bot]
d257d29d78
Bump pry from 0.12.2 to 0.13.1 ( #13626 )
...
Bumps [pry](https://github.com/pry/pry ) from 0.12.2 to 0.13.1.
- [Release notes](https://github.com/pry/pry/releases )
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md )
- [Commits](https://github.com/pry/pry/compare/v0.12.2...v0.13.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:48:48 +02:00
dependabot-preview[bot]
dc0a845b5e
Bump better_errors from 2.6.0 to 2.7.0 ( #13663 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:48:12 +02:00
dependabot-preview[bot]
d579828eea
Bump rspec-core from 3.9.1 to 3.9.2 ( #13602 )
...
Bumps [rspec-core](https://github.com/rspec/rspec-core ) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/rspec/rspec-core/releases )
- [Changelog](https://github.com/rspec/rspec-core/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-core/compare/v3.9.1...v3.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:47:50 +02:00
dependabot-preview[bot]
6ad0f963b3
Bump redis-activesupport from 5.0.4 to 5.2.0 ( #13599 )
...
Bumps [redis-activesupport](http://redis-store.org/redis-activesupport ) from 5.0.4 to 5.2.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:46:44 +02:00
dependabot-preview[bot]
6bb4571232
Bump aws-sdk-s3 from 1.63.0 to 1.64.0 ( #13675 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.63.0 to 1.64.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.63.0...v1.64.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:45:34 +02:00
dependabot-preview[bot]
835eb64330
Bump yaml from 1.8.3 to 1.9.2 ( #13667 )
...
Bumps [yaml](https://github.com/eemeli/yaml ) from 1.8.3 to 1.9.2.
- [Release notes](https://github.com/eemeli/yaml/releases )
- [Commits](https://github.com/eemeli/yaml/compare/v1.8.3...v1.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:45:04 +02:00
dependabot-preview[bot]
e437ca4268
Bump sidekiq from 6.0.4 to 6.0.7 ( #13630 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.4 to 6.0.7.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.4...v6.0.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:43:26 +02:00
dependabot-preview[bot]
0d326807ad
Bump json-ld from 3.1.3 to 3.1.4 ( #13661 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.3...3.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:42:34 +02:00
dependabot-preview[bot]
05316f8a77
Bump jwt from 2.1.0 to 2.2.1 ( #13639 )
...
Bumps [jwt](https://github.com/jwt/ruby-jwt ) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/jwt/ruby-jwt/releases )
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.1.0...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:42:19 +02:00
dependabot-preview[bot]
b8eae24b2e
Bump http from 4.3.0 to 4.4.1 ( #13598 )
...
Bumps [http](https://github.com/httprb/http ) from 4.3.0 to 4.4.1.
- [Release notes](https://github.com/httprb/http/releases )
- [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md )
- [Commits](https://github.com/httprb/http/compare/v4.3.0...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 18:42:12 +02:00
dependabot-preview[bot]
eb0a323a4b
Bump webpacker from 4.2.2 to 5.1.1 ( #13631 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 4.2.2 to 5.1.1.
- [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.2...v5.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 17:52:54 +02:00
dependabot-preview[bot]
054b8d75c2
Bump redis from 4.1.3 to 4.1.4 ( #13636 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.1.3 to 4.1.4.
- [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.3...v4.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 17:45:22 +02:00
dependabot-preview[bot]
2b956c1218
Bump rack-attack from 6.2.2 to 6.3.0 ( #13657 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 6.2.2 to 6.3.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.2.2...v6.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 17:44:24 +02:00
dependabot-preview[bot]
174eed7bec
Bump strong_migrations from 0.6.2 to 0.6.5 ( #13649 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.6.2 to 0.6.5.
- [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.6.2...v0.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 17:44:00 +02:00
dependabot-preview[bot]
9cabc9c5d2
Bump brakeman from 4.8.0 to 4.8.1 ( #13652 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.8.0 to 4.8.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.8.0...v4.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 17:42:54 +02:00
dependabot-preview[bot]
b964fd3df6
Bump premailer-rails from 1.10.3 to 1.11.1 ( #13620 )
...
Bumps [premailer-rails](https://github.com/fphilipe/premailer-rails ) from 1.10.3 to 1.11.1.
- [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.3...v1.11.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-08 17:42:05 +02:00
dependabot-preview[bot]
1bef85ffc9
Bump doorkeeper from 5.3.2 to 5.3.3 ( #13673 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.3.2 to 5.3.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/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-07 22:30:56 +02:00
dependabot-preview[bot]
2902138336
Bump pghero from 2.4.1 to 2.4.2 ( #13603 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.4.1 to 2.4.2.
- [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.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-07 20:29:15 +02:00
dependabot-preview[bot]
51dad928c6
[Security] Bump doorkeeper from 5.3.1 to 5.3.2 ( #13613 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.3.1 to 5.3.2. **This update includes a security fix.**
- [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/v.5.3.1...v5.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-07 20:16:15 +02:00
dependabot-preview[bot]
f51c547407
Bump kaminari from 1.1.1 to 1.2.0 ( #13596 )
...
Bumps [kaminari](https://github.com/kaminari/kaminari ) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/kaminari/kaminari/releases )
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kaminari/kaminari/compare/v1.1.1...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-05-04 13:53:42 +02:00
ThibG
dea5db0e25
Fix PgHero Content-Security-Policy when CDN_HOST is used ( #13595 )
2020-05-04 13:52:41 +02:00
Hanage999
ff72c0472f
Fix tootctl upgrade storage-schema failing to delete empty directories ( #13593 )
2020-05-04 13:51:34 +02:00
ThibG
75b0fa8b76
Merge pull request #1324 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-05-03 23:29:41 +02:00
Eugen Rochko
5cff7910c2
Add more ActivityPub controller tests ( #13590 )
2020-05-03 22:19:24 +02:00
ThibG
c0b849bdfd
Fix use of inline CSS in public pages ( #13576 )
...
Change `account_link_to` to use an image tag rather than some
inline CSS. Dropped the `size` parameter in the process, but it wasn't
used for anything except the default value of 36px.
Dropped CSS rules that were always overriden, and defaulted to 36px width
and height instead.
2020-05-03 22:04:18 +02:00
ThibG
89fcd68b75
[Glitch] Fix admin-facing uses of inline CSS
...
Port b8ba977497
2020-05-03 21:47:58 +02:00
ThibG
7ea8b07b93
[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus
...
Port 77ec0875ea
2020-05-03 21:47:11 +02:00
ThibG
9e5a216878
[Glitch] Fix end-user-facing uses of inline CSS
...
Port 0e362b7678
2020-05-03 21:44:43 +02:00
ThibG
4a5f93c25f
[Glitch] Refactor/cleanup TIMELINE_DELETE-related code
...
Port ad9c7aefe6
2020-05-03 21:42:13 +02:00
ThibG
502a0365df
[Glitch] Fix messed up z-index when NoScript blocks media/previews
...
Port 04eb599864
2020-05-03 21:41:15 +02:00
Thibaut Girka
a22e6a3683
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/statuses_controller.rb`:
Upstream disabled the embed controller for reblogs.
Not a real conflict, but glitch-soc has an extra line to deal
with its theming system.
Ported upstream changes.
- `app/javascript/packs/public.js`:
Upstream made changes to get rid of most inline CSS, this changes
javascript for public pages, which in glitch are split between
different files. Ported those changes.
- `app/models/status.rb`:
Upstream changed the block check in `Status#permitted_for` to
include domain-block checks. Not a real conflict with glitch-soc,
but our scope is slightly different, as our scope for
unauthenticated access do not include instance-local toots.
Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
Not a real conflict, upstream added a new field to the instance
serializer, the conflict is one line above since we added more of
that.
Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
Upstream got rid of most inline CSS and moved hidden elements
to data attributes in the process, in fields were we have
different values.
Ported upstream changes while keeping our glitch-specific
values.
- `app/views/statuses/_simple_status.html.haml`:
Upstream got rid of inline CSS on an HAML line we treat
differently, stripping empty text nodes.
Ported upstream changes to the style attribute, keeping
the empty text node stripping behavior.
2020-05-03 21:23:49 +02:00
Yamagishi Kazutoshi
e223fd8c61
Revert "improve status title ( #8596 )" ( #13591 )
...
This reverts commit 05756c9a14
2020-05-03 18:48:13 +02:00
Eugen Rochko
988b0493fe
Add more tests for ActivityPub controllers ( #13585 )
2020-05-03 16:30:36 +02:00
Shlee
a1062df1e1
Fix the circleci packages for Buster. ( #13583 )
...
* Update config.yml
* Update config.yml
* Update config.yml
* Update config.yml
* Update config.yml
* Update config.yml
* Update config.yml
* Update .circleci/config.yml
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
* Update config.yml
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-05-01 23:45:40 +02:00
Eugen Rochko
60408fa3ef
Change CircleCI test output ( #13587 )
2020-05-01 20:19:01 +02:00
