me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12384 commits 2 branches 0 tags 429 MiB
Commit graph

654 commits

Author SHA1 Message Date
Thibaut Girka
0afe3c1562 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.
 2020-08-01 20:24:23 +02:00
dependabot[bot]
565a0c571e Bump eslint from 6.8.0 to 7.5.0 (#14454) 
* Bump eslint from 6.8.0 to 7.5.0

Bumps [eslint](https://github.com/eslint/eslint) from 6.8.0 to 7.5.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.8.0...v7.5.0)

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

* Fix .codeclimate.yml

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2020-07-29 04:52:35 +09:00
dependabot[bot]
91ef72990d Bump webpack from 4.43.0 to 4.44.0 (#14435) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.43.0 to 4.44.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.43.0...v4.44.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 00:50:24 +09:00
dependabot[bot]
dc8cabd5ac Bump @babel/core from 7.10.3 to 7.10.5 (#14334) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.10.3 to 7.10.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.5/packages/babel-core)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 13:43:18 +09:00
dependabot[bot]
c7c6665ba3 Bump yargs from 15.4.0 to 15.4.1 (#14333) 
Bumps [yargs](https://github.com/yargs/yargs) from 15.4.0 to 15.4.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/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 10:14:28 +09:00
dependabot[bot]
8333848d5c Bump autoprefixer from 9.8.0 to 9.8.5 (#14434) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.8.0 to 9.8.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.8.0...9.8.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 10:12:55 +09:00
dependabot[bot]
56fff47531 Bump eslint-plugin-import from 2.21.2 to 2.22.0 (#14329) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.21.2 to 2.22.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.21.2...v2.22.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 07:11:26 +09:00
dependabot[bot]
d6d9419239 Bump react-textarea-autosize from 8.1.1 to 8.2.0 (#14325) 
Bumps [react-textarea-autosize](https://github.com/Andarist/react-textarea-autosize) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/Andarist/react-textarea-autosize/releases)
- [Changelog](https://github.com/Andarist/react-textarea-autosize/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Andarist/react-textarea-autosize/compare/v8.1.1...v8.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 06:59:49 +09:00
dependabot[bot]
c1cdfe895e Bump @testing-library/react from 10.4.3 to 10.4.7 (#14317) 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 10.4.3 to 10.4.7.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v10.4.3...v10.4.7)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 06:58:12 +09:00
dependabot[bot]
912d299e65 Bump sass from 1.26.8 to 1.26.10 (#14327) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.26.8 to 1.26.10.
- [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.26.8...1.26.10)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 05:59:17 +09:00
dependabot[bot]
1306e94cab Bump @babel/plugin-proposal-decorators from 7.10.3 to 7.10.5 (#14324) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.10.3 to 7.10.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.5/packages/babel-plugin-proposal-decorators)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 05:56:27 +09:00
dependabot[bot]
4b8d5ad458 Bump @babel/plugin-transform-runtime from 7.10.4 to 7.10.5 (#14322) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.10.4 to 7.10.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.5/packages/babel-plugin-transform-runtime)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 05:55:08 +09:00
dependabot[bot]
7621c25356 Bump react-redux from 7.2.0 to 7.2.1 (#14408) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.0...v7.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 02:50:39 +09:00
dependabot[bot]
d180b17a80 Bump eslint-plugin-react from 7.20.0 to 7.20.4 (#14422) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.20.0 to 7.20.4.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.20.0...v7.20.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 02:27:30 +09:00
Thibaut Girka
714a3fcb3b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
 2020-07-22 13:38:17 +02:00
dependabot[bot]
7cb4344efb Bump lodash from 4.17.15 to 4.17.19 (#14321) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-17 07:06:45 +02:00
Thibaut Girka
67564cbb48 Merge branch 'master' into glitch-soc/merge-upstream 2020-07-08 15:23:41 +02:00
ThibG
7b50afbfdf Revert tesseract.js to tesseract.js@2.0.0-alpha.16 (#14262) 
The OCR feature in master is broken, there are several reasons for this:
- https://github.com/naptha/tesseract.js/issues/369
- https://github.com/naptha/tesseract.js/issues/346
- and the fact that the worker JS file is served with an unversioned URL,
  and, in the nginx config we provide, served with
  "public, max-age=31536000, immutable", leading to version mismatches as
  the old version gets cached
 2020-07-08 13:57:06 +02:00
Thibaut Girka
c2347f6cf6 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
 2020-07-07 15:58:45 +02:00
dependabot[bot]
cb4e4714c1 Bump babel-jest from 25.2.4 to 26.1.0 (#14216) 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.2.4 to 26.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/v26.1.0/packages/babel-jest)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-07 09:23:29 +09:00
dependabot[bot]
a5f8e28ef3 Bump @babel/preset-react from 7.10.1 to 7.10.4 (#14228) 
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.10.1 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-react)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-07 05:50:42 +09:00
dependabot[bot]
5005e7be3d Bump @babel/plugin-transform-runtime from 7.10.3 to 7.10.4 (#14217) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.10.3 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-runtime)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-07 05:49:58 +09:00
dependabot[bot]
44f3dc84b1 Bump @babel/plugin-transform-react-inline-elements from 7.10.1 to 7.10.4 (#14236) 
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.10.1 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-react-inline-elements)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-06 23:56:59 +09:00
dependabot[bot]
29d078eb69 Bump arrow-key-navigation from 1.1.0 to 1.2.0 (#14222) 
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases)
- [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.1.0...v1.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-06 23:24:00 +09:00
dependabot[bot]
e2f069e09c Bump yargs from 15.3.1 to 15.4.0 (#14234) 
Bumps [yargs](https://github.com/yargs/yargs) from 15.3.1 to 15.4.0.
- [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.3.1...v15.4.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-06 23:06:29 +09:00
dependabot[bot]
1be04e8679 Bump terser-webpack-plugin from 3.0.3 to 3.0.6 (#14238) 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 3.0.3 to 3.0.6.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.3...v3.0.6)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-06 23:00:02 +09:00
dependabot[bot]
c8ef2dd4eb Bump @babel/preset-env from 7.10.2 to 7.10.4 (#14218) 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.10.2 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-env)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-06 22:27:12 +09:00
Thibaut Girka
05f2993e3b Revert "Revert "Remove unused dependency on wavesurfer.js (#14136)"" 
This reverts commit d3f692f7f9.
 2020-07-02 17:31:09 +02:00
Thibaut Girka
2a2af880b8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
 2020-06-30 23:00:20 +02:00
dependabot[bot]
a941212907 Bump uuid from 8.1.0 to 8.2.0 (#14162) 
Bumps [uuid](https://github.com/uuidjs/uuid) from 8.1.0 to 8.2.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/v8.1.0...v8.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-30 01:24:56 +09:00
dependabot[bot]
890a6d704a Bump webpack-cli from 3.3.11 to 3.3.12 (#14164) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.11 to 3.3.12.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.12/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.11...v3.3.12)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:50:12 +09:00
dependabot[bot]
a72d95015e Bump @babel/plugin-transform-runtime from 7.10.1 to 7.10.3 (#14168) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.10.1 to 7.10.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-plugin-transform-runtime)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:49:48 +09:00
dependabot[bot]
c575d09adc Bump react-textarea-autosize from 8.0.1 to 8.1.1 (#14177) 
Bumps [react-textarea-autosize](https://github.com/Andarist/react-textarea-autosize) from 8.0.1 to 8.1.1.
- [Release notes](https://github.com/Andarist/react-textarea-autosize/releases)
- [Changelog](https://github.com/Andarist/react-textarea-autosize/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Andarist/react-textarea-autosize/compare/v8.0.1...v8.1.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-29 21:47:42 +09:00
Yamagishi Kazutoshi
72ff9a1d65 Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
Thibaut Girka
d3f692f7f9 Revert "Remove unused dependency on wavesurfer.js (#14136)" 
This reverts commit 1fcf4d65d5.
 2020-06-26 13:03:39 +02:00
Thibaut Girka
0e33582bff Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
Yamagishi Kazutoshi
7061b5d1da Remove unnecessary version locks (#14139) 2020-06-25 22:41:24 +02:00
dependabot[bot]
5f79cef474 Bump @babel/plugin-proposal-decorators from 7.8.3 to 7.10.3 (#14137) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.8.3 to 7.10.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-plugin-proposal-decorators)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 19:01:15 +09:00
dependabot[bot]
9a91ef76ea Bump eslint-plugin-jsx-a11y from 6.2.3 to 6.3.1 (#14114) 
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.2.3 to 6.3.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.3...v6.3.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:24:15 +09:00
dependabot[bot]
4dc95e80dc Bump @babel/core from 7.10.2 to 7.10.3 (#14112) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.10.2 to 7.10.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-core)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:19:30 +09:00
ThibG
1fcf4d65d5 Remove unused dependency on wavesurfer.js (#14136) 
It's not used anymore now that the audio player design has changed again.
 2020-06-24 22:54:06 +02:00
Thibaut Girka
c1eb60642b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
 2020-06-24 15:33:41 +02:00
dependabot[bot]
3f187b6260 Bump sass from 1.26.5 to 1.26.8 (#14078) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.26.5 to 1.26.8.
- [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.26.5...1.26.8)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-21 08:30:09 +09:00
Thibaut Girka
4d5ff62de5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
 2020-06-17 17:10:15 +02:00
dependabot[bot]
ffd4d20687 Bump jest from 25.4.0 to 26.0.1 (#14056) 
Bumps [jest](https://github.com/facebook/jest) from 25.4.0 to 26.0.1.
- [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/v25.4.0...v26.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:48:15 +09:00
dependabot[bot]
34703f9cbc Bump eslint-plugin-import from 2.20.2 to 2.21.2 (#14054) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.2 to 2.21.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.2...v2.21.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:38:23 +09:00
dependabot[bot]
21212d5625 Bump css-loader from 3.5.3 to 3.6.0 (#14041) 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.5.3...v3.6.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:37:30 +09:00
dependabot[bot]
6e95d08af6 Bump @babel/plugin-transform-react-inline-elements from 7.9.0 to 7.10.1 (#14048) 
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.9.0 to 7.10.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-plugin-transform-react-inline-elements)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:25:17 +09:00
Thibaut Girka
83dc54c487 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
 2020-06-09 10:39:20 +02:00
dependabot[bot]
2c86a6b395 Bump react-immutable-pure-component from 1.2.3 to 2.2.2 (#14010) 
Bumps [react-immutable-pure-component](https://github.com/Monar/react-immutable-pure-component) from 1.2.3 to 2.2.2.
- [Release notes](https://github.com/Monar/react-immutable-pure-component/releases)
- [Commits](https://github.com/Monar/react-immutable-pure-component/compare/v1.2.3...v2.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-08 15:10:37 +09:00