]> cat aescling's git repositories - mastodon.git/log
cat aescling's git repositories / mastodon.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
mastodon.git
6 years agoOverride Migrator.new instead of Migrator#initialize, it's easier to understand
commit | commitdiff | tree
Thibaut Girka [Wed, 20 Nov 2019 16:31:22 +0000 (17:31 +0100)]
Override Migrator.new instead of Migrator#initialize, it's easier to understand

6 years agoAdd documentation about the migration hack
commit | commitdiff | tree
Thibaut Girka [Wed, 20 Nov 2019 16:18:00 +0000 (17:18 +0100)]
Add documentation about the migration hack

6 years agoMonkey-patch Rails' migrator to ignore duplicate migrations across Mastodon and glitc...
commit | commitdiff | tree
Thibaut Girka [Wed, 20 Nov 2019 16:03:25 +0000 (17:03 +0100)]
Monkey-patch Rails' migrator to ignore duplicate migrations across Mastodon and glitch-soc

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
commit | commitdiff | tree
Thibaut Girka [Wed, 20 Nov 2019 14:36:09 +0000 (15:36 +0100)]
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

6 years agoFix account dropdown not opening due to regression from #12377 (#12430)
commit | commitdiff | tree
Eugen Rochko [Tue, 19 Nov 2019 23:56:22 +0000 (00:56 +0100)]
Fix account dropdown not opening due to regression from #12377 (#12430)

6 years agoBump react-dom from 16.11.0 to 16.12.0 (#12415)
commit | commitdiff | tree
dependabot-preview[bot] [Tue, 19 Nov 2019 20:28:00 +0000 (05:28 +0900)]
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>
6 years agoAdd relationship-based options to status dropdowns (#12377)
commit | commitdiff | tree
Eugen Rochko [Tue, 19 Nov 2019 20:24:16 +0000 (21:24 +0100)]
Add relationship-based options to status dropdowns (#12377)

Move bookmark action in inline statuses from action bar to dropdown

6 years agoStore rspec statuses in .cache/rspec (#12427)
commit | commitdiff | tree
Dimitri Merejkowsky [Tue, 19 Nov 2019 16:22:40 +0000 (17:22 +0100)]
Store rspec statuses in .cache/rspec (#12427)

This allows using rspec with `--only-failures`

6 years agoBump glob from 7.1.5 to 7.1.6 (#12413)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 14:04:53 +0000 (23:04 +0900)]
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>
6 years agoBump babel-plugin-preval from 3.0.1 to 4.0.0 (#12414)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:43:49 +0000 (22:43 +0900)]
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>
6 years agoBump aws-sdk-s3 from 1.52.0 to 1.55.0 (#12419)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:40:16 +0000 (22:40 +0900)]
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>
6 years agoBump derailed_benchmarks from 1.4.1 to 1.4.2 (#12418)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:40:04 +0000 (22:40 +0900)]
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>
6 years agoBump react-textarea-autosize from 7.1.0 to 7.1.2 (#12412)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:30:10 +0000 (22:30 +0900)]
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>
6 years agoBump httplog from 1.3.2 to 1.3.3 (#12420)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:29:00 +0000 (22:29 +0900)]
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>
6 years agoBump rack-attack from 6.1.0 to 6.2.1 (#12421)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:26:08 +0000 (22:26 +0900)]
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>
6 years agoBump @babel/preset-react from 7.6.3 to 7.7.0 (#12410)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:21:52 +0000 (22:21 +0900)]
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>
6 years agoBump doorkeeper from 5.2.1 to 5.2.2 (#12417)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:13:23 +0000 (22:13 +0900)]
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>
6 years agoBump copy-webpack-plugin from 5.0.4 to 5.0.5 (#12408)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:10:46 +0000 (22:10 +0900)]
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>
6 years agoBump react-select from 3.0.5 to 3.0.8 (#12407)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 13:07:31 +0000 (22:07 +0900)]
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>
6 years ago[Security] Bump nokogiri from 1.10.4 to 1.10.5 (#12404)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 18 Nov 2019 00:15:30 +0000 (09:15 +0900)]
[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>
6 years agoAdd cache for OEmbed endpoints to avoid extra HTTP requests (#12403)
commit | commitdiff | tree
Eugen Rochko [Sun, 17 Nov 2019 17:40:33 +0000 (18:40 +0100)]
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

6 years agoSupport min_id-based pagination for bookmarks (#12381)
commit | commitdiff | tree
Gomasy [Sun, 17 Nov 2019 16:09:42 +0000 (01:09 +0900)]
Support min_id-based pagination for bookmarks (#12381)

* Support min_id-based pagination for bookmarks

* Fix spec

6 years agoEdit CONTRIBUTING.md (#12401)
commit | commitdiff | tree
sclaire-1 [Sun, 17 Nov 2019 11:25:10 +0000 (03:25 -0800)]
Edit CONTRIBUTING.md (#12401)

Edited to improve clarity, concision, and assertiveness

6 years agomake it not return http 400 when passing and empty source argument (#12259)
commit | commitdiff | tree
Jennifer Glauche [Sat, 16 Nov 2019 18:02:09 +0000 (19:02 +0100)]
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

6 years ago[Security] Bump rack-cors from 1.0.3 to 1.0.6 (#12395)
commit | commitdiff | tree
dependabot-preview[bot] [Fri, 15 Nov 2019 20:51:42 +0000 (21:51 +0100)]
[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>
6 years agoFix inconsistent interpolations test by ignoring single plural keys (#12394)
commit | commitdiff | tree
Eugen Rochko [Fri, 15 Nov 2019 20:23:03 +0000 (21:23 +0100)]
Fix inconsistent interpolations test by ignoring single plural keys (#12394)

6 years agoFix localization test failing due to order of locale definitions (#12393)
commit | commitdiff | tree
Eugen Rochko [Fri, 15 Nov 2019 20:00:09 +0000 (21:00 +0100)]
Fix localization test failing due to order of locale definitions (#12393)

6 years agoAdd kn, mr, ur to available locales (#12379)
commit | commitdiff | tree
Eugen Rochko [Wed, 13 Nov 2019 22:36:41 +0000 (23:36 +0100)]
Add kn, mr, ur to available locales (#12379)

6 years agoNew Crowdin translations (#12146)
commit | commitdiff | tree
Eugen Rochko [Wed, 13 Nov 2019 22:24:55 +0000 (23:24 +0100)]
New Crowdin translations (#12146)

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations simple_form.en.yml (Bengali)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations activerecord.en.yml (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (Danish)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.yml (Kannada)
[ci skip]

* New translations simple_form.en.yml (Kannada)
[ci skip]

* New translations activerecord.en.yml (Kannada)
[ci skip]

* New translations devise.en.yml (Kannada)
[ci skip]

* New translations doorkeeper.en.yml (Kannada)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.yml (Marathi)
[ci skip]

* New translations simple_form.en.yml (Marathi)
[ci skip]

* New translations activerecord.en.yml (Marathi)
[ci skip]

* New translations devise.en.yml (Marathi)
[ci skip]

* New translations doorkeeper.en.yml (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations simple_form.en.yml (Hindi)
[ci skip]

* New translations activerecord.en.yml (Hindi)
[ci skip]

* New translations devise.en.yml (Hindi)
[ci skip]

* New translations doorkeeper.en.yml (Hindi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.yml (Urdu (Pakistan))
[ci skip]

* New translations simple_form.en.yml (Urdu (Pakistan))
[ci skip]

* New translations activerecord.en.yml (Urdu (Pakistan))
[ci skip]

* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]

* New translations doorkeeper.en.yml (Urdu (Pakistan))
[ci skip]

* New translations activerecord.en.yml (Marathi)
[ci skip]

* New translations doorkeeper.en.yml (Marathi)
[ci skip]

* New translations doorkeeper.en.yml (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Malayalam)
[ci skip]

* New translations simple_form.en.yml (Malayalam)
[ci skip]

* New translations activerecord.en.yml (Malayalam)
[ci skip]

* New translations devise.en.yml (Malayalam)
[ci skip]

* New translations doorkeeper.en.yml (Malayalam)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations devise.en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations devise.en.yml (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Malayalam)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations devise.en.yml (Estonian)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations devise.en.yml (Malayalam)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Malayalam)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations devise.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations devise.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations devise.en.yml (Slovak)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations doorkeeper.en.yml (Tamil)
[ci skip]

* New translations doorkeeper.en.yml (Tamil)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations devise.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations devise.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations devise.en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations doorkeeper.en.yml (Russian)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

6 years agoAdd bookmarks (#7107)
commit | commitdiff | tree
ThibG [Wed, 13 Nov 2019 22:02:10 +0000 (23:02 +0100)]
Add bookmarks (#7107)

* Add backend support for bookmarks

Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.

* Add spec for bookmark endpoints

* Add front-end support for bookmarks

* Introduce OAuth scopes for bookmarks

* Add bookmarks to archive takeout

* Fix migration

* Coding style fixes

* Fix rebase issue

* Update bookmarked_statuses to latest UI changes

* Update bookmark actions to properly reflect status changes in state

* Add bookmarks item to single-column layout

* Make active bookmarks red

6 years agoChange to always returns html document in error pages (#12214)
commit | commitdiff | tree
Yamagishi Kazutoshi [Wed, 13 Nov 2019 21:53:05 +0000 (06:53 +0900)]
Change to always returns html document in error pages (#12214)

6 years agoAdd config for issue template (#12306)
commit | commitdiff | tree
Yamagishi Kazutoshi [Wed, 13 Nov 2019 21:51:49 +0000 (06:51 +0900)]
Add config for issue template (#12306)

6 years agoEdit introduction of README.md (#12372)
commit | commitdiff | tree
sclaire-1 [Wed, 13 Nov 2019 12:54:47 +0000 (04:54 -0800)]
Edit introduction of README.md (#12372)

The introductory paragraph has been edited to be more cohesive.

6 years agoBump @babel/core from 7.4.5 to 7.7.2 (#12350)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 15:25:34 +0000 (00:25 +0900)]
Bump @babel/core from 7.4.5 to 7.7.2 (#12350)

Bumps [@babel/core](https://github.com/babel/babel) from 7.4.5 to 7.7.2.
- [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.4.5...v7.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/plugin-proposal-decorators from 7.6.0 to 7.7.0 (#12348)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:52:24 +0000 (22:52 +0900)]
Bump @babel/plugin-proposal-decorators from 7.6.0 to 7.7.0 (#12348)

Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel) from 7.6.0 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.0...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/runtime from 7.7.1 to 7.7.2 (#12351)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:51:32 +0000 (22:51 +0900)]
Bump @babel/runtime from 7.7.1 to 7.7.2 (#12351)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.1 to 7.7.2.
- [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.2/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump enzyme-adapter-react-16 from 1.14.0 to 1.15.1 (#12353)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:50:55 +0000 (22:50 +0900)]
Bump enzyme-adapter-react-16 from 1.14.0 to 1.15.1 (#12353)

Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.14.0 to 1.15.1.
- [Release notes](https://github.com/airbnb/enzyme/releases)
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.15.1/packages/enzyme-adapter-react-16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump babel-plugin-react-intl from 3.1.3 to 3.4.1 (#12352)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:45:58 +0000 (22:45 +0900)]
Bump babel-plugin-react-intl from 3.1.3 to 3.4.1 (#12352)

Bumps [babel-plugin-react-intl](https://github.com/formatjs/formatjs) from 3.1.3 to 3.4.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/babel-plugin-react-intl@3.1.3...babel-plugin-react-intl@3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump parallel from 1.17.0 to 1.18.0 (#12358)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:43:43 +0000 (22:43 +0900)]
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>
6 years agoBump rubocop from 0.75.1 to 0.76.0 (#12355)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:42:50 +0000 (22:42 +0900)]
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>
6 years agoBump faker from 2.6.0 to 2.7.0 (#12354)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:38:07 +0000 (22:38 +0900)]
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>
6 years agoBump annotate from 3.0.2 to 3.0.3 (#12359)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:37:34 +0000 (22:37 +0900)]
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>
6 years agoBump stoplight from 2.1.3 to 2.2.0 (#12360)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:34:48 +0000 (22:34 +0900)]
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>
6 years agoBump react-notification from 6.8.4 to 6.8.5 (#12349)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:24:27 +0000 (22:24 +0900)]
Bump react-notification from 6.8.4 to 6.8.5 (#12349)

Bumps [react-notification](https://github.com/pburtchaell/react-notification) from 6.8.4 to 6.8.5.
- [Release notes](https://github.com/pburtchaell/react-notification/releases)
- [Commits](https://github.com/pburtchaell/react-notification/compare/6.8.4...6.8.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump uuid from 3.3.2 to 3.3.3 (#12347)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:22:06 +0000 (22:22 +0900)]
Bump uuid from 3.3.2 to 3.3.3 (#12347)

Bumps [uuid](https://github.com/kelektiv/node-uuid) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/kelektiv/node-uuid/releases)
- [Changelog](https://github.com/kelektiv/node-uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kelektiv/node-uuid/compare/v3.3.2...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/plugin-proposal-class-properties from 7.5.5 to 7.7.0 (#12346)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:17:22 +0000 (22:17 +0900)]
Bump @babel/plugin-proposal-class-properties from 7.5.5 to 7.7.0 (#12346)

Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.5.5 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.5.5...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @clusterws/cws from 0.15.2 to 0.16.0 (#12345)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:15:31 +0000 (22:15 +0900)]
Bump @clusterws/cws from 0.15.2 to 0.16.0 (#12345)

Bumps @clusterws/cws from 0.15.2 to 0.16.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump fuubar from 2.4.1 to 2.5.0 (#12356)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 11 Nov 2019 13:05:16 +0000 (22:05 +0900)]
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>
6 years agoFix broken admin audit log in whitelist mode (#12303)
commit | commitdiff | tree
ThibG [Sun, 10 Nov 2019 22:05:15 +0000 (23:05 +0100)]
Fix broken admin audit log in whitelist mode (#12303)

6 years agoFix unread toot indicator not honoring onlyMedia in public and community timelines...
commit | commitdiff | tree
ThibG [Sun, 10 Nov 2019 22:05:02 +0000 (23:05 +0100)]
Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330)

* Fix unread toot indicator not honoring onlyMedia in public and community timelines

* Fixup: `unread` already accounts for new content in pending items

6 years agoFix already-known remote private toots not being searchable by URL (#12336)
commit | commitdiff | tree
ThibG [Sun, 10 Nov 2019 22:04:48 +0000 (23:04 +0100)]
Fix already-known remote private toots not being searchable by URL (#12336)

* Fix already-known remote private toots not being searchable by URL

Whenever an URL search fails, and an account is provided, try getting a
private status matching that URL from database.

* Fix searching by `id` field instead of `uri`

6 years agoUpdated Twemoji to 12.1.3 (#12342)
commit | commitdiff | tree
koyu [Sun, 10 Nov 2019 22:04:24 +0000 (23:04 +0100)]
Updated Twemoji to 12.1.3 (#12342)

6 years ago[Security] Bump brakeman from 4.6.1 to 4.7.1 (#12329)
commit | commitdiff | tree
dependabot-preview[bot] [Fri, 8 Nov 2019 05:45:42 +0000 (14:45 +0900)]
[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>
6 years agoMerge pull request #1243 from ThibG/glitch-soc/merge-upstream
commit | commitdiff | tree
ThibG [Thu, 7 Nov 2019 20:15:22 +0000 (21:15 +0100)]
Merge pull request #1243 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix type mismatch (#12324)
commit | commitdiff | tree
Darius Kazemi [Thu, 7 Nov 2019 19:51:48 +0000 (11:51 -0800)]
Fix type mismatch (#12324)

This was [causing an issue with feed regeneartion in tootctl](https://github.com/hometown-fork/hometown/issues/24), and @davefp fixed the issue.

6 years agoFix build with new sass-loader
commit | commitdiff | tree
Thibaut Girka [Thu, 7 Nov 2019 13:56:09 +0000 (14:56 +0100)]
Fix build with new sass-loader

6 years ago[Glitch] Minor improvements to poll composing UI
commit | commitdiff | tree
Thibaut Girka [Thu, 7 Nov 2019 13:43:07 +0000 (14:43 +0100)]
[Glitch] Minor improvements to poll composing UI

Port 7cdb8c10e97fe9e22411efef4986e6393247e0ee to glitch-soc

6 years ago[Glitch] Fix WebUI allowing to upload more items than the limit
commit | commitdiff | tree
ThibG [Thu, 7 Nov 2019 07:07:03 +0000 (08:07 +0100)]
[Glitch] Fix WebUI allowing to upload more items than the limit

Port 66684c489c3c0bde752d107b02fc3bd6cbcacf04 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
commit | commitdiff | tree
Thibaut Girka [Thu, 7 Nov 2019 12:43:56 +0000 (13:43 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's

6 years agoMerge pull request #1242 from ThibG/glitch-soc/merge-upstream
commit | commitdiff | tree
ThibG [Thu, 7 Nov 2019 12:41:56 +0000 (13:41 +0100)]
Merge pull request #1242 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoChange CircleCI config to build assets with NODE_ENV=test
commit | commitdiff | tree
Thibaut Girka [Thu, 7 Nov 2019 11:47:41 +0000 (12:47 +0100)]
Change CircleCI config to build assets with NODE_ENV=test

This should avoid minimization and other expensive webpack
transformations which aren't useful for running tests.

6 years agoDisable minimization in test environment
commit | commitdiff | tree
Thibaut Girka [Thu, 7 Nov 2019 12:16:10 +0000 (13:16 +0100)]
Disable minimization in test environment

6 years agoFix relationship caches being broken as result of a follow request (#12299)
commit | commitdiff | tree
ThibG [Thu, 7 Nov 2019 07:08:00 +0000 (08:08 +0100)]
Fix relationship caches being broken as result of a follow request (#12299)

6 years agoFix WebUI allowing to upload more items than the limit (#12300)
commit | commitdiff | tree
ThibG [Thu, 7 Nov 2019 07:07:03 +0000 (08:07 +0100)]
Fix WebUI allowing to upload more items than the limit (#12300)

Until this patch, drag'n'drop and copy-paste allowed to start uploading as
long as the number of *finished* uploads was below the limit.

6 years agoMinor improvements to poll composing UI (#12319)
commit | commitdiff | tree
ThibG [Thu, 7 Nov 2019 07:06:06 +0000 (08:06 +0100)]
Minor improvements to poll composing UI (#12319)

- Disable the “add option” button instead of hiding it
- Allow poll option inputs to scale to full width

6 years agoFix various issues with account migration (#12301)
commit | commitdiff | tree
ThibG [Thu, 7 Nov 2019 07:05:07 +0000 (08:05 +0100)]
Fix various issues with account migration (#12301)

* Fix being able to follow oneself by moving to an account that was following the old one

* Add specs

* Add spec to catch MoveWorker issue with local followers following both accounts

* Fix move worker breaking when a local account follows both source and target accounts

* Fix migration from remote to local account not sending Undo Follow

* Fix show_reblogs not being preserved for moved account's followers

6 years agoBump sass-loader from 7.1.0 to 8.0.0 (#12027)
commit | commitdiff | tree
dependabot-preview[bot] [Wed, 6 Nov 2019 16:15:20 +0000 (01:15 +0900)]
Bump sass-loader from 7.1.0 to 8.0.0 (#12027)

* Bump sass-loader from 7.1.0 to 8.0.0

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.1.0 to 8.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.1.0...v8.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* bump webpack

6 years agoBump @babel/runtime from 7.6.0 to 7.7.1 (#12317)
commit | commitdiff | tree
dependabot-preview[bot] [Wed, 6 Nov 2019 15:55:46 +0000 (00:55 +0900)]
Bump @babel/runtime from 7.6.0 to 7.7.1 (#12317)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.6.0 to 7.7.1.
- [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.1/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/preset-env from 7.6.0 to 7.7.1 (#12318)
commit | commitdiff | tree
dependabot-preview[bot] [Wed, 6 Nov 2019 15:55:22 +0000 (00:55 +0900)]
Bump @babel/preset-env from 7.6.0 to 7.7.1 (#12318)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.7.1.
- [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.0...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)
commit | commitdiff | tree
dependabot-preview[bot] [Wed, 6 Nov 2019 15:14:46 +0000 (00:14 +0900)]
Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)

Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.16 to 2.0.0-beta.2.
- [Release notes](https://github.com/naptha/tesseract.js/releases)
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.16...v2.0.0-beta.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump glob from 7.1.4 to 7.1.5 (#12312)
commit | commitdiff | tree
dependabot-preview[bot] [Wed, 6 Nov 2019 15:14:26 +0000 (00:14 +0900)]
Bump glob from 7.1.4 to 7.1.5 (#12312)

Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.4 to 7.1.5.
- [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.4...v7.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump sass from 1.23.1 to 1.23.3 (#12314)
commit | commitdiff | tree
dependabot-preview[bot] [Wed, 6 Nov 2019 15:12:48 +0000 (00:12 +0900)]
Bump sass from 1.23.1 to 1.23.3 (#12314)

Bumps [sass](https://github.com/sass/dart-sass) from 1.23.1 to 1.23.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.23.1...1.23.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/preset-react from 7.0.0 to 7.6.3 (#12315)
commit | commitdiff | tree
dependabot-preview[bot] [Wed, 6 Nov 2019 15:11:08 +0000 (00:11 +0900)]
Bump @babel/preset-react from 7.0.0 to 7.6.3 (#12315)

Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.0.0 to 7.6.3.
- [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.0.0...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years ago[Glitch] Fix notification message for own poll
commit | commitdiff | tree
Thibaut Girka [Wed, 6 Nov 2019 14:06:53 +0000 (15:06 +0100)]
[Glitch] Fix notification message for own poll

Port a4301b52026827ad1cd90bfc77fabda92785a4c3 and be93318c0538ccfc41997301800dc347ad0f4271 to glitch-soc

6 years ago[Glitch] fix: support KaiOS arrow navigation on public pages
commit | commitdiff | tree
Nolan Lawson [Mon, 4 Nov 2019 12:03:09 +0000 (04:03 -0800)]
[Glitch] fix: support KaiOS arrow navigation on public pages

Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix filtered out items being counted as pending items
commit | commitdiff | tree
ThibG [Mon, 4 Nov 2019 12:02:16 +0000 (13:02 +0100)]
[Glitch] Fix filtered out items being counted as pending items

Port 3db3c107629a96c60657a615d186e32bb8a5476a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Use inert polyfill
commit | commitdiff | tree
Gabriel Rubens [Mon, 4 Nov 2019 12:03:44 +0000 (09:03 -0300)]
[Glitch] Use inert polyfill

Port 3cc9ff872f676d7ce56f7cf7875f85f804ea20a9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Add support for submitting media description with ctrl+enter
commit | commitdiff | tree
ThibG [Mon, 4 Nov 2019 11:59:17 +0000 (12:59 +0100)]
[Glitch] Add support for submitting media description with ctrl+enter

Port 7488a9e1547733a750160b202942c21f27ffeff2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] dont crash with null-ref
commit | commitdiff | tree
Hinaloe [Mon, 4 Nov 2019 11:58:19 +0000 (20:58 +0900)]
[Glitch] dont crash with null-ref

Port 8568018935adbf5f59d9bf9a64069d7fa9821b04 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix an issue where polls with 'expires_at' not set expired
commit | commitdiff | tree
Takeshi Umeda [Sun, 27 Oct 2019 11:45:55 +0000 (20:45 +0900)]
[Glitch] Fix an issue where polls with 'expires_at' not set expired

Port 5b46467474dd88e1563561bf50643324b4f021e8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
commit | commitdiff | tree
Thibaut Girka [Wed, 6 Nov 2019 13:38:28 +0000 (14:38 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `package.json`

6 years agoBump webpack-cli from 3.3.9 to 3.3.10 (#12297)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 4 Nov 2019 15:28:47 +0000 (00:28 +0900)]
Bump webpack-cli from 3.3.9 to 3.3.10 (#12297)

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.9 to 3.3.10.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.10/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.9...v3.3.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump react-overlays from 0.8.3 to 0.9.1 (#12298)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 4 Nov 2019 15:23:26 +0000 (00:23 +0900)]
Bump react-overlays from 0.8.3 to 0.9.1 (#12298)

Bumps [react-overlays](https://github.com/react-bootstrap/react-overlays) from 0.8.3 to 0.9.1.
- [Release notes](https://github.com/react-bootstrap/react-overlays/releases)
- [Changelog](https://github.com/react-bootstrap/react-overlays/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-bootstrap/react-overlays/compare/v0.8.3...v0.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 (#12296)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 4 Nov 2019 14:33:05 +0000 (23:33 +0900)]
Bump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 (#12296)

Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.5.5 to 7.6.2.
- [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.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump webpack-dev-server from 3.8.1 to 3.9.0 (#12293)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 4 Nov 2019 14:27:50 +0000 (23:27 +0900)]
Bump webpack-dev-server from 3.8.1 to 3.9.0 (#12293)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.8.1 to 3.9.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.8.1...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump react-test-renderer from 16.10.2 to 16.11.0 (#12295)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 4 Nov 2019 14:27:07 +0000 (23:27 +0900)]
Bump react-test-renderer from 16.10.2 to 16.11.0 (#12295)

Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.10.2 to 16.11.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.11.0/packages/react-test-renderer)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump wavesurfer.js from 3.0.0 to 3.2.0 (#12292)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 4 Nov 2019 14:21:40 +0000 (23:21 +0900)]
Bump wavesurfer.js from 3.0.0 to 3.2.0 (#12292)

Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js) from 3.0.0 to 3.2.0.
- [Release notes](https://github.com/katspaugh/wavesurfer.js/releases)
- [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md)
- [Commits](https://github.com/katspaugh/wavesurfer.js/compare/3.0.0...3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump react-toggle from 4.0.2 to 4.1.1 (#12291)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 4 Nov 2019 14:15:23 +0000 (23:15 +0900)]
Bump react-toggle from 4.0.2 to 4.1.1 (#12291)

Bumps [react-toggle](https://github.com/aaronshaf/react-toggle) from 4.0.2 to 4.1.1.
- [Release notes](https://github.com/aaronshaf/react-toggle/releases)
- [Changelog](https://github.com/aaronshaf/react-toggle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aaronshaf/react-toggle/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump react-dom from 16.10.2 to 16.11.0 (#12289)
commit | commitdiff | tree
dependabot-preview[bot] [Mon, 4 Nov 2019 13:55:46 +0000 (22:55 +0900)]
Bump react-dom from 16.10.2 to 16.11.0 (#12289)

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.10.2 to 16.11.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.11.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoUse inert polyfill (#12209)
commit | commitdiff | tree
Gabriel Rubens [Mon, 4 Nov 2019 12:03:44 +0000 (09:03 -0300)]
Use inert polyfill (#12209)

* Inserting wicg-inert in project

* Import wicg-inert in moda_root component

* Update yarn.lock

* Solving code style problems

* Removing package-lock

6 years agoIntegrate own poll's translation into own_poll. (#12231)
commit | commitdiff | tree
mayaeh [Mon, 4 Nov 2019 12:03:29 +0000 (21:03 +0900)]
Integrate own poll's translation into own_poll. (#12231)

run `yarn manage:translations en`

6 years agofix: support KaiOS arrow navigation on public pages (#12251)
commit | commitdiff | tree
Nolan Lawson [Mon, 4 Nov 2019 12:03:09 +0000 (04:03 -0800)]
fix: support KaiOS arrow navigation on public pages (#12251)

6 years agoFix code referencing wrong class (#12263)
commit | commitdiff | tree
ThibG [Mon, 4 Nov 2019 12:02:27 +0000 (13:02 +0100)]
Fix code referencing wrong class (#12263)

For some reason, I have seen this only triggered here:
https://circleci.com/gh/tootsuite/mastodon/98324?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link

But Follow.find_by referenced the ActivityPub::Activity::Follow class
instead of the model class.

6 years agoFix filtered out items being counted as pending items (#12266)
commit | commitdiff | tree
ThibG [Mon, 4 Nov 2019 12:02:16 +0000 (13:02 +0100)]
Fix filtered out items being counted as pending items (#12266)

6 years agoAdd abilityto add oneself to lists (#12271)
commit | commitdiff | tree
ThibG [Mon, 4 Nov 2019 12:02:01 +0000 (13:02 +0100)]
Add abilityto add oneself to lists (#12271)

* Add ability to add oneself to lists

* Change search results to include oneself when searching through followers

* Mark follow relation as optional in ListAccount

6 years agoFix notification filters not applying to poll options (#12269)
commit | commitdiff | tree
ThibG [Mon, 4 Nov 2019 12:01:50 +0000 (13:01 +0100)]
Fix notification filters not applying to poll options (#12269)

6 years agoFix crowdin badge display in CONTRIBUTING.md (#12273)
commit | commitdiff | tree
Scott Sweeny [Mon, 4 Nov 2019 12:01:38 +0000 (07:01 -0500)]
Fix crowdin badge display in CONTRIBUTING.md (#12273)

* Fix crowdin badge display in CONTRIBUTING.md

The Crowdin localization badge in `CONTRIBUTING.md` appeared to have the wrong markup around it. This manifested in some extra brackets and an unformatted `crowdin` string.

* Make Crowdin badge a link to the Mastodon project

6 years agoFix remote media descriptions being cut off at 420 chars (#12262)
commit | commitdiff | tree
ThibG [Mon, 4 Nov 2019 12:00:16 +0000 (13:00 +0100)]
Fix remote media descriptions being cut off at 420 chars (#12262)

* Fix remote media descriptions being cut off at 420 chars

Fixes #12258

* Fix tests

6 years agoAdd support for submitting media description with ctrl+enter (#12272)
commit | commitdiff | tree
ThibG [Mon, 4 Nov 2019 11:59:17 +0000 (12:59 +0100)]
Add support for submitting media description with ctrl+enter (#12272)

6 years agodont crash with null-ref (#12274)
commit | commitdiff | tree
Hinaloe [Mon, 4 Nov 2019 11:58:19 +0000 (20:58 +0900)]
dont crash with null-ref (#12274)

next
source code fur Kibicat Mastodon