fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 15:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
11881 commits 130 branches 269 tags 979 MiB
Commit graph

649 commits

Author SHA1 Message Date
dependabot-preview[bot] 6be2717039
Bump jest-runtime from 25.4.0 to 25.5.4 (#13706) 
Bumps [jest-runtime](https://github.com/facebook/jest/tree/HEAD/packages/jest-runtime) from 25.4.0 to 25.5.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.5.4/packages/jest-runtime)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-11 21:52:37 +09:00
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
 2020-05-10 16:19:56 +02:00
dependabot-preview[bot] f135c1bf09
Bump scheduler from 0.19.0 to 0.19.1 (#13666) 
Bumps [scheduler](https://github.com/facebook/react/tree/HEAD/packages/scheduler) from 0.19.0 to 0.19.1.
- [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/HEAD/packages/scheduler)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:36:50 +02:00
dependabot-preview[bot] 0cb4c57e8e
Bump core-js-compat from 3.6.4 to 3.6.5 (#13656) 
Bumps [core-js-compat](https://github.com/zloirock/core-js) from 3.6.4 to 3.6.5.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.6.4...v3.6.5)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:36:32 +02:00
dependabot-preview[bot] 02f9f9d375
Bump cssstyle from 2.2.0 to 2.3.0 (#13678) 
Bumps [cssstyle](https://github.com/jsdom/cssstyle) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/jsdom/cssstyle/releases)
- [Commits](https://github.com/jsdom/cssstyle/compare/v2.2.0...v2.3.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:36:07 +02:00
dependabot-preview[bot] d9f140b48d
Bump html-entities from 1.2.1 to 1.3.1 (#13669) 
Bumps [html-entities](https://github.com/mdevils/node-html-entities) from 1.2.1 to 1.3.1.
- [Release notes](https://github.com/mdevils/node-html-entities/releases)
- [Commits](https://github.com/mdevils/node-html-entities/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:35:56 +02:00
dependabot-preview[bot] b89874b8ef
Bump cli-width from 2.2.0 to 2.2.1 (#13668) 
Bumps [cli-width](https://github.com/knownasilya/cli-width) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/knownasilya/cli-width/releases)
- [Changelog](https://github.com/knownasilya/cli-width/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knownasilya/cli-width/compare/v2.2.0...v2.2.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:35:40 +02:00
dependabot-preview[bot] e6d99b0672
Bump uuid from 7.0.3 to 8.0.0 (#13665) 
Bumps [uuid](https://github.com/uuidjs/uuid) from 7.0.3 to 8.0.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v7.0.3...v8.0.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:35:24 +02:00
dependabot-preview[bot] 27ea57c109
Bump node-releases from 1.1.53 to 1.1.55 (#13664) 
Bumps [node-releases](https://github.com/chicoxyzzy/node-releases) from 1.1.53 to 1.1.55.
- [Release notes](https://github.com/chicoxyzzy/node-releases/releases)
- [Commits](https://github.com/chicoxyzzy/node-releases/compare/v1.1.53...v1.1.55)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:33:43 +02:00
dependabot-preview[bot] db5e024cd1
Bump tiny-invariant from 1.0.6 to 1.1.0 (#13662) 
Bumps [tiny-invariant](https://github.com/alexreardon/tiny-invariant) from 1.0.6 to 1.1.0.
- [Release notes](https://github.com/alexreardon/tiny-invariant/releases)
- [Commits](https://github.com/alexreardon/tiny-invariant/compare/v1.0.6...v1.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:33:23 +02:00
dependabot-preview[bot] 02d6f08b43
Bump postcss-selector-parser from 3.1.1 to 3.1.2 (#13660) 
Bumps [postcss-selector-parser](https://github.com/postcss/postcss-selector-parser) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/postcss/postcss-selector-parser/releases)
- [Changelog](https://github.com/postcss/postcss-selector-parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss-selector-parser/compare/v3.1.1...v3.1.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:33:02 +02:00
dependabot-preview[bot] eac25d5f01
Bump babel-plugin-react-intl from 3.4.1 to 6.2.0 (#13648) 
Bumps [babel-plugin-react-intl](https://github.com/formatjs/formatjs) from 3.4.1 to 6.2.0.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:32:37 +02:00
dependabot-preview[bot] 8e5d46819d
Bump w3c-hr-time from 1.0.1 to 1.0.2 (#13647) 
Bumps [w3c-hr-time](https://github.com/jsdom/w3c-hr-time) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/jsdom/w3c-hr-time/releases)
- [Changelog](https://github.com/jsdom/w3c-hr-time/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsdom/w3c-hr-time/compare/v1.0.1...v1.0.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:32:09 +02:00
dependabot-preview[bot] 2b81632104
Bump readable-stream from 2.3.6 to 2.3.7 (#13646) 
Bumps [readable-stream](https://github.com/nodejs/readable-stream) from 2.3.6 to 2.3.7.
- [Release notes](https://github.com/nodejs/readable-stream/releases)
- [Commits](https://github.com/nodejs/readable-stream/compare/v2.3.6...v2.3.7)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:31:56 +02:00
dependabot-preview[bot] ccc8ae3c66
Bump rxjs from 6.5.2 to 6.5.5 (#13644) 
Bumps [rxjs](https://github.com/reactivex/rxjs) from 6.5.2 to 6.5.5.
- [Release notes](https://github.com/reactivex/rxjs/releases)
- [Changelog](https://github.com/ReactiveX/rxjs/blob/6.5.5/CHANGELOG.md)
- [Commits](https://github.com/reactivex/rxjs/compare/6.5.2...6.5.5)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:31:41 +02:00
dependabot-preview[bot] 235a19d46f
Bump damerau-levenshtein from 1.0.4 to 1.0.6 (#13642) 
Bumps [damerau-levenshtein](https://github.com/tad-lispy/node-damerau-levenshtein) from 1.0.4 to 1.0.6.
- [Release notes](https://github.com/tad-lispy/node-damerau-levenshtein/releases)
- [Changelog](https://github.com/tad-lispy/node-damerau-levenshtein/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tad-lispy/node-damerau-levenshtein/compare/v1.0.4...v1.0.6)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:31:18 +02:00
dependabot-preview[bot] 61076038be
Bump @babel/preset-env from 7.9.0 to 7.9.6 (#13637) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.9.0 to 7.9.6.
- [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.9.0...v7.9.6)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:31:06 +02:00
dependabot-preview[bot] 1536670e14
Bump exec-sh from 0.3.2 to 0.3.4 (#13635) 
Bumps [exec-sh](https://github.com/tsertkov/exec-sh) from 0.3.2 to 0.3.4.
- [Release notes](https://github.com/tsertkov/exec-sh/releases)
- [Commits](https://github.com/tsertkov/exec-sh/commits/v0.3.4)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:30:49 +02:00
dependabot-preview[bot] d43a9deb91
Bump electron-to-chromium from 1.3.391 to 1.3.430 (#13627) 
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.391 to 1.3.430.
- [Release notes](https://github.com/kilian/electron-to-chromium/releases)
- [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.391...v1.3.430)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:30:22 +02:00
dependabot-preview[bot] ec6171b60e
Bump @babel/core from 7.9.0 to 7.9.6 (#13604) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.9.0 to 7.9.6.
- [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.9.0...v7.9.6)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:29:53 +02:00
dependabot-preview[bot] 9fd461bf47
Bump es6-weak-map from 2.0.2 to 2.0.3 (#13621) 
Bumps [es6-weak-map](https://github.com/medikoo/es6-weak-map) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/medikoo/es6-weak-map/releases)
- [Changelog](https://github.com/medikoo/es6-weak-map/blob/master/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es6-weak-map/compare/v2.0.2...v2.0.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:29:24 +02:00
dependabot-preview[bot] 5bf8de2b0d
Bump postgres-interval from 1.1.2 to 1.2.0 (#13623) 
Bumps [postgres-interval](https://github.com/bendrucker/postgres-interval) from 1.1.2 to 1.2.0.
- [Release notes](https://github.com/bendrucker/postgres-interval/releases)
- [Commits](https://github.com/bendrucker/postgres-interval/compare/v1.1.2...v1.2.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:27:44 +02:00
dependabot-preview[bot] 8b1465c3ff
Bump deep-equal from 1.1.0 to 1.1.1 (#13619) 
Bumps [deep-equal](https://github.com/inspect-js/node-deep-equal) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/inspect-js/node-deep-equal/releases)
- [Changelog](https://github.com/inspect-js/node-deep-equal/blob/master/CHANGELOG.md)
- [Commits](https://github.com/inspect-js/node-deep-equal/compare/v1.1.0...v1.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:27:10 +02:00
dependabot-preview[bot] 58b5b5c32f
Bump array.prototype.find from 2.1.0 to 2.1.1 (#13611) 
Bumps [array.prototype.find](https://github.com/paulmillr/Array.prototype.find) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/paulmillr/Array.prototype.find/releases)
- [Changelog](https://github.com/paulmillr/Array.prototype.find/blob/master/CHANGELOG.md)
- [Commits](https://github.com/paulmillr/Array.prototype.find/compare/v2.1.0...v2.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:26:28 +02:00
dependabot-preview[bot] c5f59839c0
Bump next-tick from 1.0.0 to 1.1.0 (#13608) 
Bumps [next-tick](https://github.com/medikoo/next-tick) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/medikoo/next-tick/releases)
- [Changelog](https://github.com/medikoo/next-tick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/medikoo/next-tick/compare/v1.0.0...v1.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:26:16 +02:00
dependabot-preview[bot] 0435b9a95e
Bump webpack-bundle-analyzer from 3.6.1 to 3.7.0 (#13607) 
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.6.1 to 3.7.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.6.1...v3.7.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:24:15 +02:00
dependabot-preview[bot] dd974b0138
Bump regexpu-core from 4.6.0 to 4.7.0 (#13606) 
Bumps [regexpu-core](https://github.com/mathiasbynens/regexpu-core) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/mathiasbynens/regexpu-core/releases)
- [Commits](https://github.com/mathiasbynens/regexpu-core/compare/v4.6.0...v4.7.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:23:45 +02:00
dependabot-preview[bot] 6b880913d4
Bump wavesurfer.js from 3.3.1 to 3.3.3 (#13605) 
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js) from 3.3.1 to 3.3.3.
- [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.3.1...3.3.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 21:23:33 +02:00
dependabot-preview[bot] 1787dc2721
Bump jest from 24.9.0 to 25.4.0 (#13517) 
Bumps [jest](https://github.com/facebook/jest) from 24.9.0 to 25.4.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.9.0...v25.4.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 18:56:07 +02:00
dependabot-preview[bot] 835eb64330
Bump yaml from 1.8.3 to 1.9.2 (#13667) 
Bumps [yaml](https://github.com/eemeli/yaml) from 1.8.3 to 1.9.2.
- [Release notes](https://github.com/eemeli/yaml/releases)
- [Commits](https://github.com/eemeli/yaml/compare/v1.8.3...v1.9.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-08 18:45:04 +02:00
Thibaut Girka a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior.
 2020-05-03 21:23:49 +02:00
dependabot-preview[bot] f70a54b34c
Bump normalize-package-data from 2.4.0 to 2.5.0 (#13561) 
Bumps [normalize-package-data](https://github.com/npm/normalize-package-data) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/npm/normalize-package-data/releases)
- [Commits](https://github.com/npm/normalize-package-data/compare/v2.4.0...v2.5.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 19:23:13 +09:00
dependabot-preview[bot] 85be934fac
Bump flatted from 2.0.0 to 2.0.2 (#13558) 
Bumps [flatted](https://github.com/WebReflection/flatted) from 2.0.0 to 2.0.2.
- [Release notes](https://github.com/WebReflection/flatted/releases)
- [Commits](https://github.com/WebReflection/flatted/compare/v2.0.0...v2.0.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 19:02:30 +09:00
dependabot-preview[bot] 9aeae7a194
Bump nearley from 2.16.0 to 2.19.2 (#13556) 
Bumps [nearley](https://github.com/hardmath123/nearley) from 2.16.0 to 2.19.2.
- [Release notes](https://github.com/hardmath123/nearley/releases)
- [Commits](https://github.com/hardmath123/nearley/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 18:47:03 +09:00
dependabot-preview[bot] 8f4dff2c52
Bump core-js-pure from 3.6.4 to 3.6.5 (#13553) 
Bumps [core-js-pure](https://github.com/zloirock/core-js) from 3.6.4 to 3.6.5.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.6.4...v3.6.5)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 18:30:51 +09:00
dependabot-preview[bot] 6c685cb55a
Bump request from 2.88.0 to 2.88.2 (#13565) 
Bumps [request](https://github.com/request/request) from 2.88.0 to 2.88.2.
- [Release notes](https://github.com/request/request/releases)
- [Changelog](https://github.com/request/request/blob/master/CHANGELOG.md)
- [Commits](https://github.com/request/request/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 18:26:30 +09:00
dependabot-preview[bot] 7abf1433c2
Bump cacache from 12.0.3 to 12.0.4 (#13567) 
Bumps [cacache](https://github.com/npm/cacache) from 12.0.3 to 12.0.4.
- [Release notes](https://github.com/npm/cacache/releases)
- [Changelog](https://github.com/npm/cacache/blob/v12.0.4/CHANGELOG.md)
- [Commits](https://github.com/npm/cacache/compare/v12.0.3...v12.0.4)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 18:15:18 +09:00
dependabot-preview[bot] 3e13223043
Bump functions-have-names from 1.2.0 to 1.2.1 (#13568) 
Bumps [functions-have-names](https://github.com/ljharb/functions-have-names) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/ljharb/functions-have-names/releases)
- [Changelog](https://github.com/inspect-js/functions-have-names/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/functions-have-names/compare/v1.2.0...v1.2.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 18:12:55 +09:00
dependabot-preview[bot] 07bfb853c0
Bump loglevel from 1.6.6 to 1.6.8 (#13569) 
Bumps [loglevel](https://github.com/pimterry/loglevel) from 1.6.6 to 1.6.8.
- [Release notes](https://github.com/pimterry/loglevel/releases)
- [Commits](https://github.com/pimterry/loglevel/compare/v1.6.6...v1.6.8)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 17:59:00 +09:00
dependabot-preview[bot] d7d8191d58
Bump svgo from 1.1.1 to 1.3.2 (#13570) 
Bumps [svgo](https://github.com/svg/svgo) from 1.1.1 to 1.3.2.
- [Release notes](https://github.com/svg/svgo/releases)
- [Changelog](https://github.com/svg/svgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svg/svgo/compare/v1.1.1...v1.3.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-28 17:46:20 +09:00
Thibaut Girka 8b2823b7b6 Merge branch 'master' into glitch-soc/merge-upstream 2020-04-25 15:19:32 +02:00
dependabot-preview[bot] ebd35eedb0
Bump globule from 1.2.1 to 1.3.1 (#13521) 
Bumps [globule](https://github.com/cowboy/node-globule) from 1.2.1 to 1.3.1.
- [Release notes](https://github.com/cowboy/node-globule/releases)
- [Commits](https://github.com/cowboy/node-globule/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-21 00:00:34 +09:00
dependabot-preview[bot] 673784eb71
Bump stream-shift from 1.0.0 to 1.0.1 (#13522) 
Bumps [stream-shift](https://github.com/mafintosh/stream-shift) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/mafintosh/stream-shift/releases)
- [Commits](https://github.com/mafintosh/stream-shift/compare/v1.0.0...v1.0.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-20 23:58:35 +09:00
dependabot-preview[bot] 2f7b3b44be
Bump uuid from 7.0.2 to 7.0.3 (#13520) 
Bumps [uuid](https://github.com/uuidjs/uuid) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v7.0.2...v7.0.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-20 23:55:32 +09:00
dependabot-preview[bot] f80419baee
Bump sisteransi from 1.0.0 to 1.0.5 (#13523) 
Bumps [sisteransi](https://github.com/terkelg/sisteransi) from 1.0.0 to 1.0.5.
- [Release notes](https://github.com/terkelg/sisteransi/releases)
- [Commits](https://github.com/terkelg/sisteransi/compare/v1.0.0...v1.0.5)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-20 23:53:18 +09:00
dependabot-preview[bot] 7104a2aea5
Bump signal-exit from 3.0.2 to 3.0.3 (#13519) 
Bumps [signal-exit](https://github.com/tapjs/signal-exit) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/tapjs/signal-exit/releases)
- [Changelog](https://github.com/tapjs/signal-exit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tapjs/signal-exit/compare/v3.0.2...v3.0.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-20 23:50:57 +09:00
Thibaut Girka 63dc7cfa90 Merge branch 'master' into glitch-soc/merge-upstream 2020-04-20 16:45:40 +02:00
dependabot-preview[bot] f2cf912771
Bump pako from 1.0.10 to 1.0.11 (#13518) 
Bumps [pako](https://github.com/nodeca/pako) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/nodeca/pako/releases)
- [Changelog](https://github.com/nodeca/pako/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/pako/compare/1.0.10...1.0.11)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-20 23:43:58 +09:00
dependabot-preview[bot] ba6474a919
Bump axobject-query from 2.0.2 to 2.1.2 (#13514) 
Bumps [axobject-query](https://github.com/A11yance/axobject-query) from 2.0.2 to 2.1.2.
- [Release notes](https://github.com/A11yance/axobject-query/releases)
- [Changelog](https://github.com/A11yance/axobject-query/blob/master/CHANGELOG.md)
- [Commits](https://github.com/A11yance/axobject-query/compare/v2.0.2...v2.1.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-20 22:22:06 +09:00
dependabot-preview[bot] 13bc3cf436
Bump console-browserify from 1.1.0 to 1.2.0 (#13515) 
Bumps [console-browserify](https://github.com/browserify/console-browserify) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/browserify/console-browserify/releases)
- [Changelog](https://github.com/browserify/console-browserify/blob/master/CHANGELOG.md)
- [Commits](https://github.com/browserify/console-browserify/compare/v1.1.0...v1.2.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-20 22:18:04 +09:00
dependabot-preview[bot] d0edb6a12b
Bump css-what from 2.1.2 to 2.1.3 (#13516) 
Bumps [css-what](https://github.com/fb55/css-what) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/fb55/css-what/releases)
- [Commits](https://github.com/fb55/css-what/compare/v2.1.2...v2.1.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-20 22:15:03 +09:00
Thibaut Girka 66ad30db48 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
- `yarn.lock`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
 2020-04-15 17:07:49 +02:00
dependabot-preview[bot] 80c04b2819
Bump watchpack from 1.6.0 to 1.6.1 (#13462) 
Bumps [watchpack](https://github.com/webpack/watchpack) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/webpack/watchpack/releases)
- [Commits](https://github.com/webpack/watchpack/compare/v1.6.0...v1.6.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-14 00:35:20 +09:00
dependabot-preview[bot] e2fa1b2626
Bump cssom from 0.3.4 to 0.3.8 (#13461) 
Bumps [cssom](https://github.com/NV/CSSOM) from 0.3.4 to 0.3.8.
- [Release notes](https://github.com/NV/CSSOM/releases)
- [Commits](https://github.com/NV/CSSOM/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-13 23:20:30 +09:00
dependabot-preview[bot] 22d8d1e178
Bump regexp.prototype.flags from 1.2.0 to 1.3.0 (#13468) 
Bumps [regexp.prototype.flags](https://github.com/es-shims/RegExp.prototype.flags) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/es-shims/RegExp.prototype.flags/releases)
- [Changelog](https://github.com/es-shims/RegExp.prototype.flags/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/RegExp.prototype.flags/compare/v1.2.0...v1.3.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-13 23:18:01 +09:00
dependabot-preview[bot] e357c771ac
Bump mousetrap from 1.6.2 to 1.6.5 (#13466) 
Bumps [mousetrap](https://github.com/ccampbell/mousetrap) from 1.6.2 to 1.6.5.
- [Release notes](https://github.com/ccampbell/mousetrap/releases)
- [Commits](https://github.com/ccampbell/mousetrap/compare/1.6.2...1.6.5)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-13 23:14:37 +09:00
dependabot-preview[bot] c067089c25
Bump mkdirp from 1.0.3 to 1.0.4 (#13463) 
Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/compare/v1.0.3...v1.0.4)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-13 23:11:52 +09:00
dependabot-preview[bot] 13e73dc9eb
Bump unicode-match-property-value-ecmascript from 1.1.0 to 1.2.0 (#13464) 
Bumps [unicode-match-property-value-ecmascript](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript/releases)
- [Commits](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript/compare/v1.1.0...v1.2.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-13 23:09:23 +09:00
dependabot-preview[bot] 267375a8a2
Bump picomatch from 2.0.7 to 2.2.2 (#13465) 
Bumps [picomatch](https://github.com/micromatch/picomatch) from 2.0.7 to 2.2.2.
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/2.0.7...2.2.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-13 23:08:13 +09:00
dependabot-preview[bot] bbd4361ffa
Bump autoprefixer from 9.7.5 to 9.7.6 (#13467) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.5 to 9.7.6.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.5...9.7.6)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-13 23:06:14 +09:00
dependabot-preview[bot] 0fc6ce7788
Bump htmlparser2 from 3.10.0 to 3.10.1 (#13469) 
Bumps [htmlparser2](https://github.com/fb55/htmlparser2) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/fb55/htmlparser2/releases)
- [Commits](https://github.com/fb55/htmlparser2/compare/v3.10.0...v3.10.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-13 23:04:15 +09:00
Thibaut Girka fdd0beefa7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
 2020-04-12 16:50:27 +02:00
dependabot-preview[bot] 7007bb0e2f
Bump babel-plugin-emotion from 10.0.19 to 10.0.33 (#13409) 
Bumps [babel-plugin-emotion](https://github.com/emotion-js/emotion) from 10.0.19 to 10.0.33.
- [Release notes](https://github.com/emotion-js/emotion/releases)
- [Changelog](https://github.com/emotion-js/emotion/blob/master/CHANGELOG.md)
- [Commits](https://github.com/emotion-js/emotion/compare/babel-plugin-emotion@10.0.19...babel-plugin-emotion@10.0.33)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:22:50 +09:00
dependabot-preview[bot] 3c44bbb347
Bump abab from 2.0.0 to 2.0.3 (#13408) 
Bumps [abab](https://github.com/jsdom/abab) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/jsdom/abab/releases)
- [Changelog](https://github.com/jsdom/abab/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsdom/abab/compare/v2.0.0...2.0.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:17:48 +09:00
dependabot-preview[bot] 0e0e73ea9c
Bump es-abstract from 1.17.0 to 1.17.5 (#13410) 
Bumps [es-abstract](https://github.com/ljharb/es-abstract) from 1.17.0 to 1.17.5.
- [Release notes](https://github.com/ljharb/es-abstract/releases)
- [Changelog](https://github.com/ljharb/es-abstract/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/es-abstract/compare/v1.17.0...v1.17.5)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:16:14 +09:00
dependabot-preview[bot] 317ae0e5db
Bump sshpk from 1.16.0 to 1.16.1 (#13412) 
Bumps [sshpk](https://github.com/joyent/node-sshpk) from 1.16.0 to 1.16.1.
- [Release notes](https://github.com/joyent/node-sshpk/releases)
- [Commits](https://github.com/joyent/node-sshpk/compare/v1.16.0...v1.16.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:15:10 +09:00
dependabot-preview[bot] d1502890ab
Bump thunky from 1.0.3 to 1.1.0 (#13411) 
Bumps [thunky](https://github.com/mafintosh/thunky) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/mafintosh/thunky/releases)
- [Commits](https://github.com/mafintosh/thunky/compare/v1.0.3...v1.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:13:11 +09:00
dependabot-preview[bot] f0432c04a0
Bump intl-format-cache from 2.1.0 to 2.2.9 (#13413) 
Bumps [intl-format-cache](https://github.com/formatjs/formatjs) from 2.1.0 to 2.2.9.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-utils@2.1.0...intl-format-cache@2.2.9)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:12:30 +09:00
dependabot-preview[bot] 6b8fe0f8db
Bump escodegen from 1.11.0 to 1.14.1 (#13414) 
Bumps [escodegen](https://github.com/estools/escodegen) from 1.11.0 to 1.14.1.
- [Release notes](https://github.com/estools/escodegen/releases)
- [Commits](https://github.com/estools/escodegen/compare/v1.11.0...v1.14.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:10:41 +09:00
dependabot-preview[bot] edcbbbe8db
Bump istanbul-lib-instrument from 3.1.0 to 3.3.0 (#13415) 
Bumps [istanbul-lib-instrument](https://github.com/istanbuljs/istanbuljs/tree/HEAD/packages/istanbul-lib-instrument) from 3.1.0 to 3.3.0.
- [Release notes](https://github.com/istanbuljs/istanbuljs/releases)
- [Changelog](https://github.com/istanbuljs/istanbuljs/blob/master/packages/istanbul-lib-instrument/CHANGELOG.md)
- [Commits](https://github.com/istanbuljs/istanbuljs/commits/istanbul-lib-instrument@3.3.0/packages/istanbul-lib-instrument)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:08:52 +09:00
dependabot-preview[bot] 25a7bf2259
Bump prop-types-extra from 1.1.0 to 1.1.1 (#13407) 
Bumps [prop-types-extra](https://github.com/react-bootstrap/prop-types-extra) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/react-bootstrap/prop-types-extra/releases)
- [Changelog](https://github.com/react-bootstrap/prop-types-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-bootstrap/prop-types-extra/compare/v1.1.0...v1.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-04-09 03:07:55 +09:00
Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
 2020-04-05 18:32:06 +02:00
Eugen Rochko 5c2e63acd5
Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#13387) 
* Bump rails from 5.2.4.1 to 5.2.4.2

* Bump kind-of from 6.0.2 to 6.0.3
 2020-04-04 23:24:59 +02:00
Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
 2020-04-02 20:32:00 +02:00
dependabot-preview[bot] dd23fc6b12
Bump autoprefixer from 9.7.4 to 9.7.5 (#13338) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.4 to 9.7.5.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.4...9.7.5)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 23:41:52 +09:00
dependabot-preview[bot] 361c447d35
Bump @babel/preset-react from 7.8.3 to 7.9.4 (#13335) 
Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.8.3 to 7.9.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.8.3...v7.9.4)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 23:37:30 +09:00
dependabot-preview[bot] 141e5c2a17
Bump babel-loader from 8.0.6 to 8.1.0 (#13333) 
Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.6 to 8.1.0.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 22:15:37 +09:00
dependabot-preview[bot] dd084c3d76
Bump yargs from 15.1.0 to 15.3.1 (#13334) 
Bumps [yargs](https://github.com/yargs/yargs) from 15.1.0 to 15.3.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v15.1.0...v15.3.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 22:15:06 +09:00
dependabot-preview[bot] 0d6ac92263
Bump @babel/preset-env from 7.8.3 to 7.9.0 (#13336) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.9.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.8.3...v7.9.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 22:13:31 +09:00
dependabot-preview[bot] 9523aa80e1
Bump babel-jest from 25.1.0 to 25.2.4 (#13332) 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.1.0 to 25.2.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.2.4/packages/babel-jest)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 22:12:52 +09:00
dependabot-preview[bot] 2db449ee23
Bump stringz from 2.0.0 to 2.1.0 (#13331) 
Bumps [stringz](https://github.com/sallar/stringz) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 22:11:00 +09:00
dependabot-preview[bot] c54f264e82
Bump react from 16.12.0 to 16.13.1 (#13337) 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.12.0 to 16.13.1.
- [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.13.1/packages/react)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 22:10:25 +09:00
dependabot-preview[bot] 31bd625205
Bump uuid from 3.4.0 to 7.0.2 (#13295) 
Bumps [uuid](https://github.com/uuidjs/uuid) from 3.4.0 to 7.0.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.4.0...v7.0.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-31 12:47:04 +02:00
Thibaut Girka 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
 2020-03-27 21:54:44 +01:00
dependabot-preview[bot] d88480da4a
Bump webpack from 4.41.5 to 4.42.1 (#13319) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.41.5 to 4.42.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.5...v4.42.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-26 12:45:12 +09:00
dependabot-preview[bot] cb5ad2bd6d
Bump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 (#13301) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.8.3 to 7.9.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.8.3...v7.9.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-26 12:44:47 +09:00
dependabot-preview[bot] 5020c04e39
Bump react-select from 3.0.8 to 3.1.0 (#13296) 
Bumps [react-select](https://github.com/JedWatson/react-select) from 3.0.8 to 3.1.0.
- [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.8...react-select@3.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-26 09:57:34 +09:00
dependabot-preview[bot] e187537dfd
Bump webpack-bundle-analyzer from 3.6.0 to 3.6.1 (#13300) 
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.6.0...v3.6.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-26 09:56:14 +09:00
dependabot-preview[bot] 29981c4950
Bump @babel/core from 7.8.6 to 7.9.0 (#13303) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.9.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.8.6...v7.9.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-26 09:55:32 +09:00
dependabot-preview[bot] 284f51e1cf
Bump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.0 (#13298) 
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.8.3 to 7.9.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.8.3...v7.9.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-26 09:54:46 +09:00
dependabot-preview[bot] b3156d0dac
Bump babel-plugin-preval from 4.0.0 to 5.0.0 (#13297) 
Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 4.0.0 to 5.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/v4.0.0...v5.0.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-26 09:53:31 +09:00
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
 2020-03-22 16:10:44 +01:00
Shlee 221eda646b
Migrate Rails ujs as required for Rails 6 Upgrade. (#13280) 
* Update yarn.lock

* Update package.json

* Update public.js

* Update admin.js

* Update log_out.js

* Update common.js
 2020-03-21 03:14:50 +01:00
dependabot-preview[bot] e65996f92b
Bump redis from 2.8.0 to 3.0.2 (#13102) 
Bumps [redis](https://github.com/NodeRedis/node-redis) from 2.8.0 to 3.0.2.
- [Release notes](https://github.com/NodeRedis/node-redis/releases)
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.0.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 19:55:31 +09:00
dependabot-preview[bot] ce228a440e
Bump mkdirp from 0.5.1 to 1.0.3 (#12979) 
Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 0.5.1 to 1.0.3.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/commits/v1.0.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 19:45:37 +09:00
dependabot-preview[bot] 6c1e452d20
Bump sass from 1.25.0 to 1.26.3 (#13263) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.25.0 to 1.26.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.25.0...1.26.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 19:44:21 +09:00
dependabot-preview[bot] 44cdc330ab
Bump react-test-renderer from 16.12.0 to 16.13.0 (#13260) 
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.12.0 to 16.13.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.13.0/packages/react-test-renderer)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 19:43:22 +09:00
dependabot-preview[bot] 83f193361f
Bump react-dom from 16.12.0 to 16.13.0 (#13181) 
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.12.0 to 16.13.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.13.0/packages/react-dom)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 19:42:04 +09:00
dependabot-preview[bot] a4387aceab
Bump babel-jest from 24.9.0 to 25.1.0 (#12973) 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 19:41:38 +09:00
dependabot-preview[bot] 6dfc161ada
Bump react-immutable-proptypes from 2.1.0 to 2.2.0 (#13259) 
Bumps [react-immutable-proptypes](https://github.com/HurricaneJames/react-immutable-proptypes) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/HurricaneJames/react-immutable-proptypes/releases)
- [Changelog](https://github.com/HurricaneJames/react-immutable-proptypes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/HurricaneJames/react-immutable-proptypes/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-03-18 19:40:49 +09:00