6fdc4e8d47
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
4 years ago
a1d7782cfd
Bump jest from 26.5.2 to 26.5.3 ( #14969 )
...
Bumps [jest](https://github.com/facebook/jest ) from 26.5.2 to 26.5.3.
- [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/v26.5.2...v26.5.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
ca6a6dc262
Bump sass from 1.26.12 to 1.27.0 ( #14973 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.12 to 1.27.0.
- [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.12...1.27.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c6a78f8cfa
Bump eslint from 7.10.0 to 7.11.0 ( #14975 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.10.0 to 7.11.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/v7.10.0...v7.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
cdf5ba96d1
Bump terser-webpack-plugin from 4.2.2 to 4.2.3 ( #14971 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 4.2.2 to 4.2.3.
- [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/v4.2.2...v4.2.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c68c6b0a03
Bump eslint-plugin-react from 7.21.3 to 7.21.4 ( #14968 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.21.3 to 7.21.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.21.3...v7.21.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
417e1e4044
Bump file-loader from 6.1.0 to 6.1.1 ( #14974 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases )
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v6.1.0...v6.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
5358c86dd1
Bump imports-loader from 1.1.0 to 1.2.0 ( #14976 )
...
Bumps [imports-loader](https://github.com/webpack-contrib/imports-loader ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/webpack-contrib/imports-loader/releases )
- [Changelog](https://github.com/webpack-contrib/imports-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/imports-loader/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>
4 years ago
1d5676a0f5
Bump sass-loader from 10.0.2 to 10.0.3 ( #14977 )
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v10.0.2...v10.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
425b76f320
Bump compression-webpack-plugin from 6.0.2 to 6.0.3 ( #14979 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v6.0.2...v6.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
1e7de61133
Bump eslint from 7.6.0 to 7.10.0 ( #14948 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.6.0 to 7.10.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/v7.6.0...v7.10.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
3061ddfe17
Bump jest from 26.4.2 to 26.5.2 ( #14951 )
...
Bumps [jest](https://github.com/facebook/jest ) from 26.4.2 to 26.5.2.
- [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/v26.4.2...v26.5.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
d2fa1948e4
Bump mini-css-extract-plugin from 0.11.0 to 0.11.3 ( #14949 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 0.11.0 to 0.11.3.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.11.0...v0.11.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
17550a54b9
Bump eslint-plugin-react from 7.21.2 to 7.21.3 ( #14950 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.21.2 to 7.21.3.
- [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.21.2...v7.21.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
9e6058bb63
Bump sass from 1.26.11 to 1.26.12 ( #14947 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.11 to 1.26.12.
- [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.11...1.26.12 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
0e59e1d09f
Bump @github/webauthn-json from 0.5.5 to 0.5.6 ( #14946 )
...
Bumps [@github/webauthn-json](https://github.com/github/webauthn-json ) from 0.5.5 to 0.5.6.
- [Release notes](https://github.com/github/webauthn-json/releases )
- [Commits](https://github.com/github/webauthn-json/compare/v0.5.5...v0.5.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
6d37006d7d
Bump babel-jest from 26.3.0 to 26.5.2 ( #14945 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 26.3.0 to 26.5.2.
- [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.5.2/packages/babel-jest )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
b9cbf80120
Bump decimal.js from 10.2.0 to 10.2.1 ( #14921 )
...
Bumps [decimal.js](https://github.com/MikeMcl/decimal.js ) from 10.2.0 to 10.2.1.
- [Release notes](https://github.com/MikeMcl/decimal.js/releases )
- [Changelog](https://github.com/MikeMcl/decimal.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MikeMcl/decimal.js/compare/v10.2.0...v10.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c3345f12c1
Bump caniuse-lite from 1.0.30001137 to 1.0.30001143 ( #14938 )
...
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite ) from 1.0.30001137 to 1.0.30001143.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases )
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001137...v1.0.30001143 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
744289b13e
Bump eslint-plugin-import from 2.22.0 to 2.22.1 ( #14936 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.22.0 to 2.22.1.
- [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.22.0...v2.22.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
3df2f59ee7
Bump object-is from 1.1.2 to 1.1.3 ( #14939 )
...
Bumps [object-is](https://github.com/es-shims/object-is ) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/es-shims/object-is/releases )
- [Changelog](https://github.com/es-shims/object-is/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/object-is/compare/v1.1.2...v1.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
12a50daf71
Bump uuid from 8.3.0 to 8.3.1 ( #14935 )
...
Bumps [uuid](https://github.com/uuidjs/uuid ) from 8.3.0 to 8.3.1.
- [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.3.0...v8.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
5bd72094b7
Bump @github/webauthn-json from 0.5.4 to 0.5.5 ( #14925 )
...
Bumps [@github/webauthn-json](https://github.com/github/webauthn-json ) from 0.5.4 to 0.5.5.
- [Release notes](https://github.com/github/webauthn-json/releases )
- [Commits](https://github.com/github/webauthn-json/compare/v0.5.4...v0.5.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
14c9158ce7
Bump http-link-header from 1.0.2 to 1.0.3 ( #14926 )
...
Bumps [http-link-header](https://github.com/jhermsmeier/node-http-link-header ) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/jhermsmeier/node-http-link-header/releases )
- [Changelog](https://github.com/jhermsmeier/node-http-link-header/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jhermsmeier/node-http-link-header/compare/v1.0.2...v1.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c3084e0c70
Bump regexpu-core from 4.7.0 to 4.7.1 ( #14940 )
...
Bumps [regexpu-core](https://github.com/mathiasbynens/regexpu-core ) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/mathiasbynens/regexpu-core/releases )
- [Commits](https://github.com/mathiasbynens/regexpu-core/compare/v4.7.0...v4.7.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
4a567139fa
Bump compression-webpack-plugin from 5.0.1 to 6.0.2 ( #14892 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 5.0.1 to 6.0.2.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v5.0.1...v6.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
fabe63bd14
Bump @testing-library/react from 10.4.7 to 11.0.4 ( #14871 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 10.4.7 to 11.0.4.
- [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.7...v11.0.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
6975d48f8c
Bump browserslist from 4.14.3 to 4.14.5 ( #14890 )
...
Bumps [browserslist](https://github.com/browserslist/browserslist ) from 4.14.3 to 4.14.5.
- [Release notes](https://github.com/browserslist/browserslist/releases )
- [Changelog](https://github.com/browserslist/browserslist/blob/master/CHANGELOG.md )
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.3...4.14.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
a445253100
Bump eslint-plugin-react from 7.20.4 to 7.21.2 ( #14874 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.20.4 to 7.21.2.
- [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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
835be36215
Bump webpack-bundle-analyzer from 3.8.0 to 3.9.0 ( #14893 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 3.8.0 to 3.9.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
e4739cfe1e
Bump react-overlays from 0.9.1 to 0.9.2 ( #14875 )
...
Bumps [react-overlays](https://github.com/react-bootstrap/react-overlays ) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/react-bootstrap/react-overlays/releases )
- [Changelog](https://github.com/react-bootstrap/react-overlays/blob/master/CHANGELOG.md )
- [Commits](https://github.com/react-bootstrap/react-overlays/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
f585161055
Bump whatwg-url from 8.2.1 to 8.2.2 ( #14882 )
...
Bumps [whatwg-url](https://github.com/jsdom/whatwg-url ) from 8.2.1 to 8.2.2.
- [Release notes](https://github.com/jsdom/whatwg-url/releases )
- [Commits](https://github.com/jsdom/whatwg-url/compare/v8.2.1...v8.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
83f9378612
Bump postcss-load-config from 2.1.0 to 2.1.2 ( #14886 )
...
Bumps [postcss-load-config](https://github.com/postcss/postcss-load-config ) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/postcss/postcss-load-config/releases )
- [Changelog](https://github.com/postcss/postcss-load-config/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss-load-config/compare/v2.1.0...v2.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
7ae60b80d6
Bump is-callable from 1.2.1 to 1.2.2 ( #14889 )
...
Bumps [is-callable](https://github.com/ljharb/is-callable ) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/ljharb/is-callable/releases )
- [Changelog](https://github.com/inspect-js/is-callable/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ljharb/is-callable/compare/v1.2.1...v1.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
ece7ad0095
Bump electron-to-chromium from 1.3.570 to 1.3.573 ( #14891 )
...
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium ) from 1.3.570 to 1.3.573.
- [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.570...v1.3.573 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
9b756d6a22
Bump sass from 1.26.10 to 1.26.11 ( #14876 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.10 to 1.26.11.
- [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.10...1.26.11 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
7a84a84fc1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
Upstream changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/models/user.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc not preventing moved accounts from logging
in.
Ported upstream changes while keeping the ability for moved accounts to log
in.
- `app/policies/status_policy.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's ability to hide followers count.
Ported upstream changes.
- `app/services/process_mentions_service.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `package.json`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
4 years ago
fbc1604694
Bump terser-webpack-plugin from 3.0.6 to 4.2.2 ( #14850 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 3.0.6 to 4.2.2.
- [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.6...v4.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
88533750fc
Bump browserslist from 4.14.1 to 4.14.3 ( #14853 )
...
Bumps [browserslist](https://github.com/browserslist/browserslist ) from 4.14.1 to 4.14.3.
- [Release notes](https://github.com/browserslist/browserslist/releases )
- [Changelog](https://github.com/browserslist/browserslist/blob/master/CHANGELOG.md )
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.1...4.14.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
614d8d941a
Bump webpack from 4.44.1 to 4.44.2 ( #14847 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.44.1 to 4.44.2.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.44.1...v4.44.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
1114fa1e86
Bump escalade from 3.0.2 to 3.1.0 ( #14851 )
...
Bumps [escalade](https://github.com/lukeed/escalade ) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/lukeed/escalade/releases )
- [Commits](https://github.com/lukeed/escalade/compare/v3.0.2...v3.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
42481ab836
Bump file-loader from 6.0.0 to 6.1.0 ( #14854 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases )
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v6.0.0...v6.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
10637a362d
Bump jest-worker from 26.2.1 to 26.3.0 ( #14849 )
...
Bumps [jest-worker](https://github.com/facebook/jest/tree/HEAD/packages/jest-worker ) from 26.2.1 to 26.3.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.3.0/packages/jest-worker )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
bedfdaff1b
Bump abab from 2.0.4 to 2.0.5 ( #14844 )
...
Bumps [abab](https://github.com/jsdom/abab ) from 2.0.4 to 2.0.5.
- [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/2.0.4...2.0.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
45ef223ac8
Bump dot-prop from 5.2.0 to 5.3.0 ( #14842 )
...
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop ) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/sindresorhus/dot-prop/releases )
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v5.2.0...v5.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
1437811152
Bump caniuse-lite from 1.0.30001129 to 1.0.30001133 ( #14831 )
...
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite ) from 1.0.30001129 to 1.0.30001133.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases )
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001129...v1.0.30001133 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
ff5d6a2633
Bump spdx-license-ids from 3.0.5 to 3.0.6 ( #14852 )
...
Bumps [spdx-license-ids](https://github.com/jslicense/spdx-license-ids ) from 3.0.5 to 3.0.6.
- [Release notes](https://github.com/jslicense/spdx-license-ids/releases )
- [Commits](https://github.com/jslicense/spdx-license-ids/compare/v3.0.5...v3.0.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
d2cc8a0daf
Bump object.assign from 4.1.0 to 4.1.1 ( #14828 )
...
Bumps [object.assign](https://github.com/ljharb/object.assign ) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/ljharb/object.assign/releases )
- [Changelog](https://github.com/ljharb/object.assign/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ljharb/object.assign/compare/v4.1.0...v4.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
65da834c35
Bump @github/webauthn-json from 0.4.2 to 0.5.4 ( #14823 )
...
Bumps [@github/webauthn-json](https://github.com/github/webauthn-json ) from 0.4.2 to 0.5.4.
- [Release notes](https://github.com/github/webauthn-json/releases )
- [Commits](https://github.com/github/webauthn-json/compare/v0.4.2...v0.5.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
73c5f54e1d
Bump axios from 0.19.2 to 0.20.0 ( #14791 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.2 to 0.20.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.20.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
Thibaut Girka
dependabot[bot]