257d816c99
Bump @babel/runtime from 7.7.2 to 7.7.4 ( #12472 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.2 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.7.4/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c2441e4e1d
Bump @babel/plugin-transform-runtime from 7.5.5 to 7.7.4 ( #12473 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel ) from 7.5.5 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7c9cb9d7e8
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>
5 years ago
00c219aa45
Fix empty poll options not being filtered on remote poll update ( #12484 )
...
If a poll contains empty options (which is apparently possible on Pleroma),
it is created without them. However, the poll update code doesn't filter
empty options, and thus:
1. Clear known votes, as it assumes the set of options has changed
2. Errors out because it tries adding empty options, which fails validation
This commit fixes that by filtering them out the same way they are filtered
out at poll creation time.
5 years ago
e7a7f88df7
Fix OCR with delete & redraft ( #12465 )
5 years ago
00b8704a32
Revert "Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 ( #12311 )" ( #12454 )
...
This reverts commit 0c20442605
5 years ago
2448568d34
Merge pull request #1247 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
271b2e68f3
[Glitch] Fix blur behind closed registration message
...
Port SCSS changes from 42b3b019e0
5 years ago
962f485423
[Glitch] Change media description label to be context-sensitive
...
Port e86234b1e9
5 years ago
c0f7e21685
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
054ef83fc5
Fix an eslint warning ( #12426 )
5 years ago
42b3b019e0
Fix blur behind closed registration message ( #12442 )
...
* Fix closed registration message blur
* Adjust overlay margins to account for blur
Fixes #12425
5 years ago
a60b602ade
Fix OEmbed discovery not handling different URL variants in query ( #12439 )
...
Fix #12433
5 years ago
2edf6d81cb
Simplify SQL query when performing account search amongst followings ( #12302 )
5 years ago
c656cc2191
Fix FetchLinkCardServices crashing on a tags without a target ( #12159 )
...
* Add test for links without targets
* Fix FetchLinkCardServices crashing on a tags without a target
5 years ago
e86234b1e9
Change media description label to be context-sensitive ( #12270 )
...
“Describe for the visually impaired” makes no sense when the uploaded media
is an audio file.
5 years ago
c4d45765e3
Change domain block behavior to update user records before deleting data ( #12247 )
...
When suspending or silencing a domain, one probably wants the silence or
suspend parts to take effect as soon as possible. Deleting media files can
take a while (possibly days), so perform silencing as soon as possible, and
clean up media afterwards.
5 years ago
5bc4edd078
Fix whitelist federation for subdomains ( #12435 )
5 years ago
55f5e81a9d
Merge pull request #1246 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
e87cc59811
Fix weird edge case in load_schema
5 years ago
6b999411fc
Revert CircleCI and some webpack changes to match upstream
5 years ago
d52e27f3db
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
64225f4ac2
[Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines
...
Port 0d6da8892a
5 years ago
5605b828e5
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
5 years ago
1064a9d827
Override Migrator.new instead of Migrator#initialize, it's easier to understand
5 years ago
33c2a7e23c
Add documentation about the migration hack
5 years ago
6475525f31
Monkey-patch Rails' migrator to ignore duplicate migrations across Mastodon and glitch-soc
5 years ago
ff67385cfb
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
5 years ago
8dfc45f757
Fix account dropdown not opening due to regression from #12377 ( #12430 )
5 years ago
5f0cba2561
Bump react-dom from 16.11.0 to 16.12.0 ( #12415 )
...
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.11.0 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
853a67ed16
Add relationship-based options to status dropdowns ( #12377 )
...
Move bookmark action in inline statuses from action bar to dropdown
5 years ago
cb3e9a2934
Store rspec statuses in .cache/rspec ( #12427 )
...
This allows using rspec with `--only-failures`
5 years ago
e8de558ee7
Bump glob from 7.1.5 to 7.1.6 ( #12413 )
...
Bumps [glob](https://github.com/isaacs/node-glob ) from 7.1.5 to 7.1.6.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.5...v7.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
6e8d6ba3b7
Bump babel-plugin-preval from 3.0.1 to 4.0.0 ( #12414 )
...
Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval ) from 3.0.1 to 4.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases )
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v3.0.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4e992e4ea8
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>
5 years ago
c4fd5156ef
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>
5 years ago
258539b2c5
Bump react-textarea-autosize from 7.1.0 to 7.1.2 ( #12412 )
...
Bumps [react-textarea-autosize](https://github.com/andreypopp/react-textarea-autosize ) from 7.1.0 to 7.1.2.
- [Release notes](https://github.com/andreypopp/react-textarea-autosize/releases )
- [Commits](https://github.com/andreypopp/react-textarea-autosize/compare/v7.1.0...v7.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5e2c08c453
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>
5 years ago
f2362f642a
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>
5 years ago
7f65eff6c3
Bump @babel/preset-react from 7.6.3 to 7.7.0 ( #12410 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel ) from 7.6.3 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9eba62a73f
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>
5 years ago
88ef210af2
Bump copy-webpack-plugin from 5.0.4 to 5.0.5 ( #12408 )
...
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin ) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v5.0.4...v5.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4bf2e080f4
Bump react-select from 3.0.5 to 3.0.8 ( #12407 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 3.0.5 to 3.0.8.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.5...react-select@3.0.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0d14102ac3
[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>
5 years ago
d14e74eff5
Add cache for OEmbed endpoints to avoid extra HTTP requests ( #12403 )
...
* add youtube oembed endpoint
* add check for oembed endpoint
* change unless for a more readable if
* clear blank lines
* endpoint via https
* Fix string literal in condition
* use cache for endpoints
* use cache for endpoints
* clean up and adding check
* clean up and remove redundant return
* add html check
* add false to return
* use double quotes
* use double quotes
* Clean up
5 years ago
5a2c0707f1
Support min_id-based pagination for bookmarks ( #12381 )
...
* Support min_id-based pagination for bookmarks
* Fix spec
5 years ago
df15a2cd37
Edit CONTRIBUTING.md ( #12401 )
...
Edited to improve clarity, concision, and assertiveness
5 years ago
fd93a9c871
make it not return http 400 when passing and empty source argument ( #12259 )
...
* make it not return http 400 when passing and empty source argument
* create a spec for the empty source hash bug
* compact checks for nil, empty? parameters
* use nil.blank? instead checking for nil
5 years ago
286bf45d4c
[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>
5 years ago
9d7cfcb1b3
Fix inconsistent interpolations test by ignoring single plural keys ( #12394 )
5 years ago
dependabot-preview[bot]