Alexandra Catalina
f68ebc9819
Update Helm release elasticsearch to v15.10.3 ( #16651 )
...
this is a backwards-compatible upgrade: https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#to-1500
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-10-14 21:01:27 +02:00
David Sterry
f68772fd6a
add bundle flag to suppress root warning ( #16557 )
2021-10-14 21:00:38 +02:00
David Sterry
a7e2e32d92
replace keys.gnupg.net with curl from rvm.io ( #16568 )
2021-10-14 20:59:41 +02:00
dependabot[bot]
ebaf9b68b5
Bump immutable from 3.8.2 to 4.0.0 ( #16841 )
...
Bumps [immutable](https://github.com/immutable-js/immutable-js ) from 3.8.2 to 4.0.0.
- [Release notes](https://github.com/immutable-js/immutable-js/releases )
- [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md )
- [Commits](https://github.com/immutable-js/immutable-js/compare/v3.8.2...v4.0.0 )
---
updated-dependencies:
- dependency-name: immutable
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-14 20:58:38 +02:00
dependabot[bot]
d1cf1ab6bd
Bump doorkeeper from 5.5.3 to 5.5.4 ( #16831 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.5.3 to 5.5.4.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.5.3...v5.5.4 )
---
updated-dependencies:
- dependency-name: doorkeeper
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-14 20:55:22 +02:00
Claire
9b978872cc
Fix 404 error when filtering admin action logs by non-existent target account ( #16643 )
...
Currently, there is no way for an admin to delete an account record. However,
should that happen in the future, or should an admin mistype an account id,
`/admin/action_logs?target_account_id=<non-existent-account-id>` currently
returns a 404 instead of an empty list.
With this commit, the aforementioned page returns a correct list instead
(potentially non-empty if the account has been manually deleted)
2021-10-14 20:53:11 +02:00
dependabot[bot]
032d9bcaed
Bump puma from 5.5.0 to 5.5.1 ( #16851 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.5.0...v5.5.1 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-14 20:51:56 +02:00
Eugen Rochko
07341e7aa6
Add graphs and retention metrics to admin dashboard ( #16829 )
2021-10-14 20:44:59 +02:00
Claire
959f7fc580
Fix tootctl self-destruct not sending Delete activities for recently-suspended accounts ( #16688 )
...
* Do not block existing users' emails on self-destruct
That is wasteful and unintuitive
* Do not close registrations when running tootctl self-destruct with --dry-run
* Close registrations on self-destruct regardless of known remote accounts
* Fix tootctl self-destruct not sending Deletes for recently-suspended accounts
* Suspend local users even if no remote account is known
* Do not show scary confirmation text if ran with --dry-run
2021-10-14 19:59:28 +02:00
Claire
216570ad98
Fix scheduled statuses decreasing statuses counts ( #16791 )
...
* Add tests
* Fix scheduled statuses decreasing statuses counts
Fixes #16774
2021-10-14 19:59:21 +02:00
Claire
ebf2c31956
Merge pull request #1620 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-10-13 16:29:17 +02:00
Sasha Sorokin
5169b374c6
[Glitch] Add single option votes tooltip in polls
...
Port 89b5071fde
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-13 15:53:33 +02:00
Claire
1665b84285
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, just a glitch-soc-only dependency textually too close
to an updated upstream one.
- `yarn.lock`:
Not really a conflict, just a glitch-soc-only dependency textually too close
to an updated upstream one.
2021-10-13 15:50:24 +02:00
Claire
5159ba26e4
Fix error when rendering public pages with media attachments ( #16763 )
...
* Add tests
* Fix error when rendering public pages with media attachments
* Add tests
* Fix tests
* Please CodeClimate
2021-10-13 15:27:19 +02:00
dependabot[bot]
8818622feb
Bump array-includes from 3.1.3 to 3.1.4 ( #16842 )
...
Bumps [array-includes](https://github.com/es-shims/array-includes ) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/es-shims/array-includes/releases )
- [Changelog](https://github.com/es-shims/array-includes/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/array-includes/compare/v3.1.3...v3.1.4 )
---
updated-dependencies:
- dependency-name: array-includes
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-13 19:29:50 +09:00
dependabot[bot]
0787e23569
Bump oj from 3.13.8 to 3.13.9 ( #16832 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.8 to 3.13.9.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.13.8...v3.13.9 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-13 19:26:30 +09:00
dependabot[bot]
76e649a385
Bump autoprefixer from 9.8.7 to 9.8.8 ( #16843 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.8.7 to 9.8.8.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/9.8.8/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.8.7...9.8.8 )
---
updated-dependencies:
- dependency-name: autoprefixer
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-13 19:21:49 +09:00
dependabot[bot]
799f81239b
Bump sidekiq-unique-jobs from 7.1.7 to 7.1.8 ( #16830 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.7 to 7.1.8.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.7...v7.1.8 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-13 19:21:09 +09:00
dependabot[bot]
eb5d0f7e7d
Bump babel-jest from 27.2.2 to 27.2.5 ( #16828 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.2.2 to 27.2.5.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.2.5/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-13 19:19:50 +09:00
dependabot[bot]
3c912491bd
Bump @babel/plugin-transform-runtime from 7.15.0 to 7.15.8 ( #16835 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.15.0 to 7.15.8.
- [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.15.8/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-13 19:18:47 +09:00
dependabot[bot]
112b735a6b
Bump @babel/plugin-proposal-decorators from 7.15.4 to 7.15.8 ( #16844 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.15.4 to 7.15.8.
- [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.15.8/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-13 19:18:19 +09:00
dependabot[bot]
cad89a8c8d
Bump object.values from 1.1.4 to 1.1.5 ( #16814 )
...
Bumps [object.values](https://github.com/es-shims/Object.values ) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/es-shims/Object.values/releases )
- [Changelog](https://github.com/es-shims/Object.values/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/Object.values/compare/v1.1.4...v1.1.5 )
---
updated-dependencies:
- dependency-name: object.values
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-13 19:15:35 +09:00
Sasha Sorokin
6c88ebfd4b
fix(streaming): req.scopes can be nullable ( #16823 )
...
When checking for required OAuth scopes, an unexpected error could
happen due to missing (null-y) req.scopes. This commit fixes that by
checking if req.scopes are present before checking if any required
scopes are present, otherwise it skips that straight to rejection.
2021-10-13 05:02:55 +02:00
Sasha Sorokin
89b5071fde
Add single option votes tooltip in polls ( #16849 )
...
Adds a tooltip when hovering over the percentages in a poll showing how
many votes were cast for that option.
Also removes descriptions from messages here since they are not picked
up by Crowdin anyway and might be confusing to other developers :)
Fixes #16820
2021-10-13 04:59:31 +02:00
dependabot[bot]
c99d28369a
Bump sass from 1.39.2 to 1.42.1 ( #16789 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.39.2 to 1.42.1.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.39.2...1.42.1 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:43:03 +09:00
dependabot[bot]
79e3abd5bc
Bump rubocop from 1.21.0 to 1.22.1 ( #16810 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.21.0 to 1.22.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.21.0...v1.22.1 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:42:40 +09:00
dependabot[bot]
e61931b98b
Bump axios from 0.21.4 to 0.22.0 ( #16817 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.21.4 to 0.22.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.21.4...v0.22.0 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:42:22 +09:00
dependabot[bot]
a07c897b57
Bump puma from 5.4.0 to 5.5.0 ( #16753 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.4.0...v5.5.0 )
---
updated-dependencies:
- dependency-name: puma
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:39:55 +09:00
dependabot[bot]
8d2ae8925b
Bump tzinfo-data from 1.2021.2 to 1.2021.3 ( #16809 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2021.2 to 1.2021.3.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2021.2...v1.2021.3 )
---
updated-dependencies:
- dependency-name: tzinfo-data
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:39:16 +09:00
dependabot[bot]
3a22be4070
Bump oj from 3.13.7 to 3.13.8 ( #16811 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.7 to 3.13.8.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.13.7...v3.13.8 )
---
updated-dependencies:
- dependency-name: oj
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:38:58 +09:00
dependabot[bot]
d2253e2e69
Bump @testing-library/react from 12.1.1 to 12.1.2 ( #16812 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 12.1.1 to 12.1.2.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.1...v12.1.2 )
---
updated-dependencies:
- dependency-name: "@testing-library/react"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:38:42 +09:00
dependabot[bot]
20b5a276bd
Bump eslint-plugin-react from 7.26.0 to 7.26.1 ( #16815 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.26.0 to 7.26.1.
- [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.26.0...v7.26.1 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:37:56 +09:00
dependabot[bot]
b376d91bd1
Bump promise.prototype.finally from 3.1.2 to 3.1.3 ( #16816 )
...
Bumps [promise.prototype.finally](https://github.com/es-shims/Promise.prototype.finally ) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/es-shims/Promise.prototype.finally/releases )
- [Changelog](https://github.com/es-shims/Promise.prototype.finally/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/Promise.prototype.finally/compare/v3.1.2...v3.1.3 )
---
updated-dependencies:
- dependency-name: promise.prototype.finally
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:37:44 +09:00
dependabot[bot]
751c29339f
Bump ws from 8.2.2 to 8.2.3 ( #16818 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.2.2 to 8.2.3.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.2.2...8.2.3 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-09 19:37:14 +09:00
Jeong Arm
0220065770
Fix status open hotkey
2021-10-07 23:40:35 +02:00
Julianne420
ebb4de7d3e
Add zh-CN translations
2021-10-07 23:40:18 +02:00
Claire
44fd66f0c6
Merge pull request #1616 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-10-06 18:02:18 +02:00
Mélanie Chauvel
cef109e046
[Glitch] Improve hover and focus style in columns settings
...
Port 900481b7fa
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-06 16:51:42 +02:00
Claire
079ed6c26d
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-06 16:46:32 +02:00
Claire
84ceebe1c4
Fix media attachment size validation not correctly accounting for file type ( #16819 )
...
* Fix media attachment size validation not correctly accounting for file type
Fixes a regression introduced in #16724 caused by the fact that kt-paperclip
now correctly runs validations before processing, meaning that file size
verification could not rely on our before_post_processing hook.
Moved the `before_post_processing` hooks to `before_validate` to make sure
the media attachment type is set correctly before the file gets validated.
* Add tests
2021-10-06 14:49:32 +01:00
Mélanie Chauvel
900481b7fa
Improve hover and focus style in columns settings ( #16222 )
...
* Make focus visible on switches and text buttons in columns settings
* Make hover/focus visible on left/right arrows in columns settings
Use same style as for station action bar (reply/boost/fav/etc.)
* Tab first to “Pin/Unpin” before left/right arrows in columns settings
2021-10-01 00:55:51 +02:00
Claire
b31748a496
Fix clicking on account name in “[xxx] boosted” text leading to broken path
2021-09-30 12:31:08 +02:00
Claire
e660a7bbb0
Merge pull request #1613 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-30 12:30:48 +02:00
Claire
56f9c44f33
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-30 11:45:13 +02:00
Claire
24f9ea7818
Fix webauthn secure key authentication ( #16792 )
...
* Add tests
* Fix webauthn secure key authentication
Fixes #16769
2021-09-30 05:26:29 +02:00
Mashiro
2e549fa2d5
Fix drawer tab menu routes in advanced web ui ( #16793 )
2021-09-30 05:19:08 +02:00
dependabot[bot]
2270d5ed74
Bump bufferutil from 4.0.3 to 4.0.4 ( #16783 )
...
Bumps [bufferutil](https://github.com/websockets/bufferutil ) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/websockets/bufferutil/releases )
- [Commits](https://github.com/websockets/bufferutil/compare/v4.0.3...v4.0.4 )
---
updated-dependencies:
- dependency-name: bufferutil
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-30 12:17:46 +09:00
dependabot[bot]
b9738dd3a7
Bump jest from 27.2.0 to 27.2.3 ( #16795 )
...
Bumps [jest](https://github.com/facebook/jest ) from 27.2.0 to 27.2.3.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v27.2.0...v27.2.3 )
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-30 12:17:33 +09:00
Claire
5e36c3b44c
Merge pull request #1612 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-09-30 00:29:38 +02:00
Claire
29b5c5f483
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
Slight refactor upstream, next to a line that was different in glitch-soc
because of our local configurable limits on custom emoji size.
Ported upstream changes.
- `yarn.lock`:
Not really a conflict, upstream dependency textually too close to a
glitch-soc-only dependency.
Updated upstream dependency as upstream.
2021-09-30 00:01:20 +02:00