fix conflict #17

ragujp · 2022-12-13T06:15:54Z

No description provided.

* New translations en.json (Catalan) * New translations en.yml (Chinese Traditional) * New translations en.yml (Thai) * New translations en.yml (Spanish) * New translations en.yml (Ukrainian) * New translations en.json (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Hungarian) * New translations en.json (Slovak) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Turkish) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations simple_form.en.yml (Thai) * New translations en.json (Irish) * New translations en.yml (Norwegian) * New translations en.yml (German) * New translations en.json (Romanian) * New translations en.yml (Danish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations en.yml (Norwegian) * New translations en.yml (Russian) * New translations en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Irish) * New translations doorkeeper.en.yml (Irish) * New translations en.yml (Danish) * New translations en.json (Catalan) * New translations en.yml (Norwegian) * New translations en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Norwegian) * New translations en.json (Catalan) * New translations en.json (Portuguese, Brazilian) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations en.yml (Latvian) * New translations en.json (Irish) * New translations en.json (Swedish) * New translations en.yml (Galician) * New translations en.json (Latvian) * New translations en.yml (Latvian) * New translations en.json (Kabyle) * New translations en.yml (Welsh) * New translations en.json (Breton) * New translations en.json (Kabyle) * New translations en.yml (Kabyle) * New translations simple_form.en.yml (Kabyle) * New translations en.json (Malay) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Malay) * New translations activerecord.en.yml (Malay) * New translations devise.en.yml (Malay) * New translations doorkeeper.en.yml (Malay) * New translations en.json (Malay) * New translations en.yml (Malay) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Malay) * New translations simple_form.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations activerecord.en.yml (Malay) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Malay) * New translations en.yml (Dutch) * New translations en.json (Malay) * New translations en.yml (Malay) * New translations en.json (English, United Kingdom) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Malay) * New translations devise.en.yml (Welsh) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Malay) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Malay) * New translations simple_form.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations devise.en.yml (Malay) * New translations en.json (Vietnamese) * New translations en.yml (Malay) * New translations en.json (Welsh) * New translations simple_form.en.yml (German) * New translations en.yml (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Catalan) * New translations en.json (Welsh) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Malay) * New translations devise.en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Catalan) * New translations en.json (Norwegian) * New translations en.json (Welsh) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Norwegian) * New translations devise.en.yml (Thai) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.yml (Norwegian) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Korean) * New translations en.json (Esperanto) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.yml (Norwegian) * New translations en.json (Welsh) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Norwegian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations devise.en.yml (Korean) * New translations en.json (Asturian) * New translations en.json (Asturian) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Bumps [promise.prototype.finally](https://github.com/es-shims/Promise.prototype.finally) from 3.1.3 to 3.1.4. - [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](es-shims/Promise.prototype.finally@v3.1.3...v3.1.4) --- 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> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/reduxjs/reselect/releases) - [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md) - [Commits](reduxjs/reselect@v4.1.6...v4.1.7) --- updated-dependencies: - dependency-name: reselect dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/SamSaffron/memory_profiler/releases) - [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md) - [Commits](SamSaffron/memory_profiler@v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: memory_profiler dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2022.4 to 1.2022.6. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](tzinfo/tzinfo-data@v1.2022.4...v1.2022.6) --- updated-dependencies: - dependency-name: tzinfo-data dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.2.0 to 3.2.2. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](ruby-rdf/json-ld-preloaded@3.2.0...3.2.2) --- updated-dependencies: - dependency-name: json-ld-preloaded dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md) - [Commits](webpack/loader-utils@v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [redux-thunk](https://github.com/reduxjs/redux-thunk) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/reduxjs/redux-thunk/releases) - [Commits](reduxjs/redux-thunk@v2.4.1...v2.4.2) --- updated-dependencies: - dependency-name: redux-thunk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [yargs](https://github.com/yargs/yargs) from 17.6.0 to 17.6.2. - [Release notes](https://github.com/yargs/yargs/releases) - [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md) - [Commits](yargs/yargs@v17.6.0...v17.6.2) --- updated-dependencies: - dependency-name: yargs dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.18 to 8.4.19. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.4.18...8.4.19) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [array-includes](https://github.com/es-shims/array-includes) from 3.1.5 to 3.1.6. - [Release notes](https://github.com/es-shims/array-includes/releases) - [Changelog](https://github.com/es-shims/array-includes/blob/main/CHANGELOG.md) - [Commits](es-shims/array-includes@v3.1.5...v3.1.6) --- updated-dependencies: - dependency-name: array-includes dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [blurhash](https://github.com/woltapp/blurhash) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/woltapp/blurhash/releases) - [Commits](https://github.com/woltapp/blurhash/commits) --- updated-dependencies: - dependency-name: blurhash dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [jsdom](https://github.com/jsdom/jsdom) from 20.0.1 to 20.0.2. - [Release notes](https://github.com/jsdom/jsdom/releases) - [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md) - [Commits](jsdom/jsdom@20.0.1...20.0.2) --- updated-dependencies: - dependency-name: jsdom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](ged/ruby-pg@v1.4.3...v1.4.4) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [object.values](https://github.com/es-shims/Object.values) from 1.1.5 to 1.1.6. - [Release notes](https://github.com/es-shims/Object.values/releases) - [Changelog](https://github.com/es-shims/Object.values/blob/main/CHANGELOG.md) - [Commits](es-shims/Object.values@v1.1.5...v1.1.6) --- updated-dependencies: - dependency-name: object.values dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [oj](https://github.com/ohler55/oj) from 3.13.21 to 3.13.23. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](ohler55/oj@v3.13.21...v3.13.23) --- updated-dependencies: - dependency-name: oj dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.5.7 to 6.5.8. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md) - [Commits](sidekiq/sidekiq@v6.5.7...v6.5.8) --- updated-dependencies: - dependency-name: sidekiq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](webpack/loader-utils@v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Several controlers set quite intricate Cache-Control headers in order to hopefully not be cached by any intermediate proxies or local caches. Unfortunately, these headers are processed by ActionDispatch::HTTP::Cache in a way that squashes and discards any values set alongside no-store other than private: https://github.com/rails/rails/blob/8015c2c2cf5c8718449677570f372ceb01318a32/actionpack/lib/action_dispatch/http/cache.rb#L207-L209 We want to preserve no-store on these responses, but we might as well remove parts that are going to be dropped anyway. As many of the endpoints in these controllers are private to a particular user, we should also add "private", which will be preserved alongside no-store.

* Bump Helm app version to 4.0.1 * Bump Helm app version to 4.0.1

* fix disappearing Explore tabs on Safari * fix lint Co-authored-by: nyura <nyura@hidden.com>

* Add maskable icon support for Android * Update manifest_serializer.rb * Fix linting issue

… button that publishes a post (#20864)

* Fix missing pagination headers on followed tags * Fix typo

Bumps [react-select](https://github.com/JedWatson/react-select) from 5.6.1 to 5.7.0. - [Release notes](https://github.com/JedWatson/react-select/releases) - [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.6.1...react-select@5.7.0) --- updated-dependencies: - dependency-name: react-select dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jest from 29.2.2 to 29.3.1 Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 29.2.2 to 29.3.1. - [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/v29.3.1/packages/jest) --- updated-dependencies: - dependency-name: jest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump jest-environment-jsdom from 29.2.1 to 29.3.1 Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.2.1 to 29.3.1. - [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/v29.3.1/packages/jest-environment-jsdom) --- updated-dependencies: - dependency-name: jest-environment-jsdom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump babel-jest from 29.2.1 to 29.3.1 Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 29.2.1 to 29.3.1. - [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/v29.3.1/packages/babel-jest) --- updated-dependencies: - dependency-name: babel-jest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [faker](https://github.com/faker-ruby/faker) from 2.23.0 to 3.0.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md) - [Commits](faker-ruby/faker@v2.23.0...v3.0.0) --- updated-dependencies: - dependency-name: faker dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix fomat-check writing files * Fix unformatted YML/JSON * Add format-check call to prevent regressions

* Fix BackfillAdminActionLogs post-deployment migration * Improve migration tests * Backfill admin action logs again

It already has 80+% completion, which is enough for everyday use. Test instance runs on https://meowstodon.net/

#21988) Fixes #21965

* Fix trying to fetch posts from other users when fetching featured posts * Rate-limit discovery of new subdomains * Put a limit on recursively discovering new accounts

* Log admin approve and reject account * Add unit tests for approve and reject logging

…obile (#22060) Fixes #20840

* Fix hidden overflow on interaction modal * only update overflow y

* Fix 500 error when trying to migrate to an invalid address * Add tests

…tions (#22127)

* New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Latin)) * New translations en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations devise.en.yml (Serbian (Latin)) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Chinese Traditional) * New translations en.json (Serbian (Latin)) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Icelandic) * New translations en.json (Serbian (Latin)) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Latin)) * New translations en.json (Malay) * New translations en.json (Malay) * New translations activerecord.en.yml (Malay) * New translations devise.en.yml (Malay) * New translations en.yml (Malay) * New translations en.yml (Arabic) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations simple_form.en.yml (Malay) * New translations en.yml (Greek) * New translations en.yml (Russian) * New translations en.yml (Belarusian) * New translations en.yml (Greek) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Greek) * New translations en.json (Greek) * New translations en.yml (Greek) * New translations en.yml (Belarusian) * New translations doorkeeper.en.yml (Greek) * New translations en.yml (Greek) * New translations en.yml (Malay) * New translations simple_form.en.yml (Malay) * New translations en.json (Esperanto) * New translations en.yml (Malay) * New translations en.yml (Esperanto) * New translations devise.en.yml (Esperanto) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Latin)) * New translations en.yml (Belarusian) * New translations en.yml (Vietnamese) * New translations en.yml (Belarusian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Serbian (Latin)) * New translations en.json (Occitan) * New translations en.json (Czech) * New translations en.yml (Hebrew) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations en.json (German) * New translations en.yml (Spanish, Argentina) * New translations en.json (German) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.json (German) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Thai) * New translations activerecord.en.yml (Scots) * New translations en.json (Scottish Gaelic) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.json (Latvian) * New translations en.json (Latvian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations en.yml (Turkish) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Danish) * New translations en.yml (Thai) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Thai) * New translations en.yml (German) * New translations en.yml (German) * New translations simple_form.en.yml (German) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Belarusian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Latvian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (German) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Spanish, Argentina) * New translations en.yml (German) * New translations en.json (German) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Persian) * New translations en.json (Spanish, Mexico) * New translations en.yml (Belarusian) * New translations en.yml (German) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations simple_form.en.yml (Scots) * New translations en.yml (Belarusian) * New translations en.yml (Danish) * New translations en.yml (Scots) * New translations simple_form.en.yml (Scots) * New translations en.json (Scots) * New translations devise.en.yml (Scots) * New translations doorkeeper.en.yml (Scots) * New translations en.yml (Greek) * New translations en.yml (Greek) * New translations en.yml (Belarusian) * New translations en.json (German) * New translations en.yml (Belarusian) * New translations en.yml (Spanish, Argentina) * New translations en.json (Spanish, Argentina) * New translations en.json (German) * New translations en.json (Esperanto) * New translations en.json (French) * New translations en.yml (Esperanto) * New translations en.yml (Belarusian) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations en.yml (Belarusian) * New translations devise.en.yml (Esperanto) * New translations en.json (Slovak) * New translations en.yml (Slovak) * New translations activerecord.en.yml (Slovak) * New translations devise.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations en.yml (Belarusian) * New translations en.yml (Slovak) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.json (Lithuanian) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.json (Esperanto) * New translations en.json (Vietnamese) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations en.yml (Belarusian) * New translations en.yml (Latvian) * New translations en.yml (Belarusian) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations en.json (Welsh) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations en.yml (Hebrew) * New translations en.yml (Welsh) * New translations en.yml (Hebrew) * New translations en.yml (Russian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Belarusian) * New translations en.yml (Ukrainian) * New translations en.json (Ukrainian) * New translations en.json (Chinese Simplified) * New translations en.json (Slovak) * New translations en.json (Slovak) * New translations en.yml (Slovak) * New translations en.yml (Belarusian) * normalize * New translations en.yml (Belarusian) * normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.13.9...v1.13.10) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.27 to 7.1.29. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md) - [Commits](mhenrixon/sidekiq-unique-jobs@v7.1.27...v7.1.29) --- 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> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [axios](https://github.com/axios/axios) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.2.0...v1.2.1) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add noindex setting to Admin settings Discovery page * Replace default_noindex i18n

* Update Node 16.18.1 for latest security release * Increase Yarn network timeout for build error

Gargron and others added 30 commits November 15, 2022 03:57

Bump version to 4.0.2 (#20725)

03b0f3a

Bump Helm app version to 4.0.2 (#20697)

f890fdc

* Bump Helm app version to 4.0.1 * Bump Helm app version to 4.0.1

Fix safari explore disappearing tabs (#20917)

aaca78d

* fix disappearing Explore tabs on Safari * fix lint Co-authored-by: nyura <nyura@hidden.com>

Add missing admin scopes (fix #20892) (#20918)

a2931d1

Add maskable icon support for Android (#20904)

413481f

* Add maskable icon support for Android * Update manifest_serializer.rb * Fix linting issue

Change batch account suspension to create a strike (#20897)

0cc7726

Bump Helm chart version to account for mastodon 4 (#20886)

642870c

Make the button that expands the publish form differentiable from the…

654d348

… button that publishes a post (#20864)

Fix pagination of followed tags (#20861)

e1f819f

* Fix missing pagination headers on followed tags * Fix typo

Fix misleading wording about waitlists (#20850)

eb80789

Add form-action CSP directive (#20781)

7955d4b

dependabot bot and others added 29 commits December 3, 2022 00:57

Correct prettier calls for YML/JSON (#21832)

f77ed3a

* Fix fomat-check writing files * Fix unformatted YML/JSON * Add format-check call to prevent regressions

Fix spacing warning from ESLint (#22005)

05d4c50

Fix pre-4.0 admin action logs (#22091)

66a70eb

* Fix BackfillAdminActionLogs post-deployment migration * Improve migration tests * Backfill admin action logs again

Fix the top border of verified account fields (#22006)

33f06a4

enable be locale (#22022)

f80c3d4

It already has 80+% completion, which is enough for everyday use. Test instance runs on https://meowstodon.net/

Fix irreversible and whole_word parameters handling in /api/v1/filters (

69137f4

#21988) Fixes #21965

Update Ubuntu, Node versions, dependencies (#22075)

98a9347

Fix unbounded recursion in account discovery (#22025)

c8849d6

* Fix trying to fetch posts from other users when fetching featured posts * Rate-limit discovery of new subdomains * Put a limit on recursively discovering new accounts

Log admin approve and reject account (#22088)

f6492a7

* Log admin approve and reject account * Add unit tests for approve and reject logging

Fix “Sign up” button with closed registrations not opening modal on m…

5109803

…obile (#22060) Fixes #20840

See version file in GitHub Actions (#21927)

e538584

Change postgres connection timeout (#21790)

3d40282

Fix UI header overflow on mobile (#21783)

76454cc

Fix hidden overflow on interaction modal (#21763)

21b208a

* Fix hidden overflow on interaction modal * only update overflow y

Fix 500 error when trying to migrate to an invalid address (#21462)

b59fb28

* Fix 500 error when trying to migrate to an invalid address * Add tests

Fix potential duplicate statuses in Explore tab (#22121)

c8a1faa

Fix deprecation warning in tootctl accounts rotate (#22120)

c52263f

Fix failure when “Require a reason to join” is set with open registra…

ed07f10

…tions (#22127)

helm: cleanup helm chart, now in mastodon/chart (#21801)

64bea71

Add CI job to label PRs with merge conflicts (#22020)

e8481e6

Add noindex setting to Admin settings Discovery page (#22205)

714e68d

* Add noindex setting to Admin settings Discovery page * Replace default_noindex i18n

Update Node 16.18.1 for latest security release (#22019)

736b428

* Update Node 16.18.1 for latest security release * Increase Yarn network timeout for build error

ragujp merged commit f159da6 into ragujp:main Dec 13, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix conflict #17

fix conflict #17

ragujp commented Dec 13, 2022

fix conflict #17

fix conflict #17

Conversation

ragujp commented Dec 13, 2022