]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years ago:sparkles: Convert LDAP username (#12461)
Mathieu Brunot [Sun, 1 Dec 2019 06:21:28 +0000 (07:21 +0100)]
:sparkles: Convert LDAP username (#12461)

* :sparkles: Convert LDAP username #12021

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* :bug: Fix conversion var use

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* :bug: Fix LDAP uid conversion test

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* :ok_hand: Remove comments with ref to PR

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* :ok_hand: Remove unnecessary paranthesis

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
* :wrench: Move space in conversion string

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
6 years agoSplit relationships page strings (#12502)
Sasha Sorokin [Sun, 1 Dec 2019 06:08:40 +0000 (13:08 +0700)]
Split relationships page strings (#12502)

Before this moment relationships managing page was using strings from
other context - from counters, but in order for translators to be able
to translate it relatively to the page, it must use separate strings.

I've split the strings for "Following" and "Followers" and put them to
"relationships" keyset in localization file. This should solve this
issue.

Fixes #10863

6 years agoFix conversations not having an unread indicator in web UI (#12506)
Eugen Rochko [Sun, 1 Dec 2019 06:06:20 +0000 (07:06 +0100)]
Fix conversations not having an unread indicator in web UI (#12506)

6 years agoFallback to Create audience when object has no defined audience (#12249)
ThibG [Sat, 30 Nov 2019 18:58:00 +0000 (19:58 +0100)]
Fallback to Create audience when object has no defined audience (#12249)

Fixes #11137

6 years agoAdd ability to filter reports by target account domain (#12154)
ThibG [Sat, 30 Nov 2019 18:53:58 +0000 (19:53 +0100)]
Add ability to filter reports by target account domain (#12154)

* Add ability to filter reports by target account domain

* Reword by_target_domain label

6 years agoLDAP & PAM added to OAuth password grant strategy (#7999) (#12390)
ntl-purism [Sat, 30 Nov 2019 18:44:59 +0000 (12:44 -0600)]
LDAP & PAM added to OAuth password grant strategy (#7999) (#12390)

When authenticating via OAuth, the resource owner password grant
strategy is allowed by Mastodon, but (without this PR), it does not
attempt to authenticate against LDAP or PAM. As a result, LDAP or PAM
authenticated users cannot sign in to Mastodon with their
email/password credentials via OAuth (for instance, for native/mobile
app users).

This PR fleshes out the authentication strategy supplied to doorkeeper
in its initializer by looking up the user with LDAP and/or PAM when
devise is configured to use LDAP/PAM backends. It attempts to follow the
same logic as the Auth::SessionsController for handling email/password
credentials.

Note #1: Since this pull request affects an initializer, it's unclear
how to add test automation.

Note #2: The PAM authentication path has not been manually tested. It
was added for completeness sake, and it is hoped that it can be manually
tested before merging.

6 years agoFix lost focus when modals open/close (#12437)
ThibG [Sat, 30 Nov 2019 17:19:47 +0000 (18:19 +0100)]
Fix lost focus when modals open/close (#12437)

* Fix lost focus after modal closes

Regression caused by the use of the wicg-inert polyfill

* Fix regression introduced by wicg-inert

* Catch errors to please CodeClimate

6 years agoMerge pull request #1249 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 30 Nov 2019 17:13:53 +0000 (18:13 +0100)]
Merge pull request #1249 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix counter sizing
Sasha Sorokin [Fri, 29 Nov 2019 16:03:38 +0000 (23:03 +0700)]
[Glitch] Fix counter sizing

Port b532ead798c481fd03be9eb78e910d62654cdaa8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Add hotkey for opening media files
ThibG [Fri, 29 Nov 2019 16:02:36 +0000 (17:02 +0100)]
[Glitch] Add hotkey for opening media files

Port a690b3e470ed85cc6f3f8fa7aec57d04b60a4705 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix pending upload count not being decremented on error
ThibG [Fri, 29 Nov 2019 16:02:18 +0000 (17:02 +0100)]
[Glitch] Fix pending upload count not being decremented on error

Port 667708f5b00ee8b7795eacd9c20d29f77c8ae602 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix OCR with delete & redraft
ThibG [Mon, 25 Nov 2019 00:42:51 +0000 (01:42 +0100)]
[Glitch] Fix OCR with delete & redraft

Port e7a7f88df7a763be6dad3a982829ef5a1b1dea09 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 30 Nov 2019 16:29:44 +0000 (17:29 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix counter sizing (#12446)
Sasha Sorokin [Fri, 29 Nov 2019 16:03:38 +0000 (23:03 +0700)]
Fix counter sizing (#12446)

Counter size is currently set to strict 33.3% width, but with it
counter may break in other languages than English. For example it is
already broken on Gargron's profile on mastodon.social using Russian
locale.

This commit changes "width" to "min-width", so counters still displayed
correctly, but if they need more width to fit text, they are now allowed
to take as many width as they need.

6 years agoUpdated NodeJS in Dockerfile (#12492)
Shlee [Fri, 29 Nov 2019 16:03:20 +0000 (00:03 +0800)]
Updated NodeJS in Dockerfile (#12492)

6 years agoImprove notifications page (#12497)
Sasha Sorokin [Fri, 29 Nov 2019 16:03:06 +0000 (23:03 +0700)]
Improve notifications page (#12497)

Currently notifications page seems a bit cluttered with no clear
separation between e-mail and filtering settings. This commit tries to
address them by adding clear separation with headers, hints and removing
continuously reused texts for events checkboxes.

6 years agoAdd hotkey for opening media files (#12498)
ThibG [Fri, 29 Nov 2019 16:02:36 +0000 (17:02 +0100)]
Add hotkey for opening media files (#12498)

* [WiP] Add hotkey to open media

* Give focus to play/pause button when opening video modal

6 years agoFix pending upload count not being decremented on error (#12499)
ThibG [Fri, 29 Nov 2019 16:02:18 +0000 (17:02 +0100)]
Fix pending upload count not being decremented on error (#12499)

The arguments were passed to the wrong function… also, there is no
need to have a conditional decrementation: failure to upload means
we marked an upload as pending, in all cases.

6 years agoFix n+1 query for bookmarks on statuses (#12494)
Eugen Rochko [Thu, 28 Nov 2019 03:08:00 +0000 (04:08 +0100)]
Fix n+1 query for bookmarks on statuses (#12494)

6 years agoFix proofs API being inaccessible in secure mode (#12495)
Eugen Rochko [Thu, 28 Nov 2019 03:07:49 +0000 (04:07 +0100)]
Fix proofs API being inaccessible in secure mode (#12495)

6 years agoLink move target account
Thibaut Girka [Sun, 24 Nov 2019 15:47:52 +0000 (16:47 +0100)]
Link move target account

6 years agoShow acct of target account
Thibaut Girka [Sun, 24 Nov 2019 15:36:04 +0000 (16:36 +0100)]
Show acct of target account

6 years agoAdd moved account warning
Thibaut Girka [Sun, 24 Nov 2019 14:57:27 +0000 (15:57 +0100)]
Add moved account warning

6 years agoDo not consider moved accounts as non-functional
Thibaut Girka [Thu, 31 Oct 2019 13:40:58 +0000 (14:40 +0100)]
Do not consider moved accounts as non-functional

This might be somewhat controversial, but putting a redirection up
makes the account unusable, which works against use cases such as
using the moved account as backup in case the new one temporarily fails
(sure, the redirection can be temporarily removed, but it is a hassle)

6 years agoBump net-ldap from 0.16.1 to 0.16.2 (#12479)
dependabot-preview[bot] [Wed, 27 Nov 2019 12:33:20 +0000 (21:33 +0900)]
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>
6 years agoBump parallel from 1.18.0 to 1.19.1 (#12475)
dependabot-preview[bot] [Wed, 27 Nov 2019 11:49:19 +0000 (20:49 +0900)]
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>
6 years agoUse override_csp options on pghero (#12489)
Yamagishi Kazutoshi [Wed, 27 Nov 2019 04:28:11 +0000 (13:28 +0900)]
Use override_csp options on pghero (#12489)

6 years agoBump browser from 2.6.1 to 2.7.1 (#12490)
dependabot-preview[bot] [Wed, 27 Nov 2019 04:19:27 +0000 (13:19 +0900)]
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>
6 years agoBump @babel/plugin-transform-react-inline-elements from 7.2.0 to 7.7.4 (#12467)
dependabot-preview[bot] [Wed, 27 Nov 2019 04:13:55 +0000 (13:13 +0900)]
Bump @babel/plugin-transform-react-inline-elements from 7.2.0 to 7.7.4 (#12467)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.2.0 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.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/preset-env from 7.7.1 to 7.7.4 (#12471)
dependabot-preview[bot] [Wed, 27 Nov 2019 03:24:13 +0000 (12:24 +0900)]
Bump @babel/preset-env from 7.7.1 to 7.7.4 (#12471)

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

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump rack-cors from 1.0.6 to 1.1.0 (#12477)
dependabot-preview[bot] [Wed, 27 Nov 2019 02:59:57 +0000 (11:59 +0900)]
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>
6 years agoBump browser from 2.6.1 to 2.7.0 (#12476)
dependabot-preview[bot] [Wed, 27 Nov 2019 02:54:40 +0000 (11:54 +0900)]
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>
6 years agoBump charlock_holmes from 0.7.6 to 0.7.7 (#12474)
dependabot-preview[bot] [Wed, 27 Nov 2019 02:53:50 +0000 (11:53 +0900)]
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>
6 years agoBump @babel/plugin-transform-react-jsx-self from 7.2.0 to 7.7.4 (#12466)
dependabot-preview[bot] [Wed, 27 Nov 2019 02:36:47 +0000 (11:36 +0900)]
Bump @babel/plugin-transform-react-jsx-self from 7.2.0 to 7.7.4 (#12466)

Bumps [@babel/plugin-transform-react-jsx-self](https://github.com/babel/babel) from 7.2.0 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.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4 (#12469)
dependabot-preview[bot] [Wed, 27 Nov 2019 02:36:29 +0000 (11:36 +0900)]
Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4 (#12469)

Bumps [@babel/plugin-syntax-dynamic-import](https://github.com/babel/babel) from 7.2.0 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.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
6 years agoBump @babel/runtime from 7.7.2 to 7.7.4 (#12472)
dependabot-preview[bot] [Wed, 27 Nov 2019 02:36:09 +0000 (11:36 +0900)]
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>
6 years agoBump @babel/plugin-transform-runtime from 7.5.5 to 7.7.4 (#12473)
dependabot-preview[bot] [Wed, 27 Nov 2019 02:35:39 +0000 (11:35 +0900)]
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>
6 years agoBump pghero from 2.3.0 to 2.4.1 (#12478)
dependabot-preview[bot] [Wed, 27 Nov 2019 00:03:02 +0000 (09:03 +0900)]
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>
6 years agoFix empty poll options not being filtered on remote poll update (#12484)
ThibG [Tue, 26 Nov 2019 21:46:31 +0000 (22:46 +0100)]
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.

6 years agoFix OCR with delete & redraft (#12465)
ThibG [Mon, 25 Nov 2019 00:42:51 +0000 (01:42 +0100)]
Fix OCR with delete & redraft (#12465)

6 years agoRevert "Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)" (#12454)
ThibG [Sun, 24 Nov 2019 03:16:41 +0000 (04:16 +0100)]
Revert "Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)" (#12454)

This reverts commit 0c204426050071c7f0e1205f1526b091e8408d5a.

6 years agoMerge pull request #1247 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 23 Nov 2019 23:36:35 +0000 (00:36 +0100)]
Merge pull request #1247 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix blur behind closed registration message
ThibG [Fri, 22 Nov 2019 14:56:59 +0000 (15:56 +0100)]
[Glitch] Fix blur behind closed registration message

Port SCSS changes from 42b3b019e01ee0c290a510483a2400e85cc250f1 to glitch flavour

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Change media description label to be context-sensitive
ThibG [Thu, 21 Nov 2019 10:39:07 +0000 (11:39 +0100)]
[Glitch] Change media description label to be context-sensitive

Port e86234b1e90975de6e507a86549f0eb4600c723b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 23 Nov 2019 18:03:01 +0000 (19:03 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix an eslint warning (#12426)
Dimitri Merejkowsky [Fri, 22 Nov 2019 14:57:22 +0000 (15:57 +0100)]
Fix an eslint warning (#12426)

6 years agoFix blur behind closed registration message (#12442)
ThibG [Fri, 22 Nov 2019 14:56:59 +0000 (15:56 +0100)]
Fix blur behind closed registration message (#12442)

* Fix closed registration message blur

* Adjust overlay margins to account for blur

Fixes #12425

6 years agoFix OEmbed discovery not handling different URL variants in query (#12439)
Eugen Rochko [Thu, 21 Nov 2019 18:03:07 +0000 (19:03 +0100)]
Fix OEmbed discovery not handling different URL variants in query (#12439)

Fix #12433

6 years agoSimplify SQL query when performing account search amongst followings (#12302)
ThibG [Thu, 21 Nov 2019 16:35:04 +0000 (17:35 +0100)]
Simplify SQL query when performing account search amongst followings (#12302)

6 years agoFix FetchLinkCardServices crashing on a tags without a target (#12159)
ThibG [Thu, 21 Nov 2019 15:04:52 +0000 (16:04 +0100)]
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

6 years agoChange media description label to be context-sensitive (#12270)
ThibG [Thu, 21 Nov 2019 10:39:07 +0000 (11:39 +0100)]
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.

6 years agoChange domain block behavior to update user records before deleting data (#12247)
ThibG [Thu, 21 Nov 2019 10:36:16 +0000 (11:36 +0100)]
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.

6 years agoFix whitelist federation for subdomains (#12435)
noiob [Thu, 21 Nov 2019 10:35:39 +0000 (11:35 +0100)]
Fix whitelist federation for subdomains (#12435)

6 years agoMerge pull request #1246 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 21 Nov 2019 09:01:26 +0000 (10:01 +0100)]
Merge pull request #1246 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix weird edge case in load_schema
Thibaut Girka [Wed, 20 Nov 2019 18:19:32 +0000 (19:19 +0100)]
Fix weird edge case in load_schema

6 years agoRevert CircleCI and some webpack changes to match upstream
Thibaut Girka [Wed, 20 Nov 2019 17:05:24 +0000 (18:05 +0100)]
Revert CircleCI and some webpack changes to match upstream

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 20 Nov 2019 16:57:17 +0000 (17:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years ago[Glitch] Fix unread toot indicator not honoring onlyMedia in public and community...
ThibG [Sun, 10 Nov 2019 22:05:02 +0000 (23:05 +0100)]
[Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines

Port 0d6da8892a675962f8e7fe1f1edc960c4a0ce36d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoBump webpacker from 4.0.7 to 4.2.0 (#12416)
dependabot-preview[bot] [Wed, 20 Nov 2019 16:56:11 +0000 (17:56 +0100)]
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

6 years agoOverride Migrator.new instead of Migrator#initialize, it's easier to understand
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
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...
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
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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>