742a8301e7
Bump fabrication from 2.29.0 to 2.30.0 ( #18901 )
...
Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication/ ) from 2.29.0 to 2.30.0.
- [Release notes](https://gitlab.com/fabrication-gem/fabrication//tags )
- [Commits](https://gitlab.com/fabrication-gem/fabrication//compare/2.29.0...2.30.0 )
---
updated-dependencies:
- dependency-name: fabrication
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>
2 years ago
7ad86cbc96
Bump stackprof from 0.2.19 to 0.2.20 ( #18903 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.19 to 0.2.20.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.19...v0.2.20 )
---
updated-dependencies:
- dependency-name: stackprof
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>
2 years ago
07025a7f1b
Bump faker from 2.21.0 to 2.22.0 ( #18899 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.21.0 to 2.22.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.21.0...v2.22.0 )
---
updated-dependencies:
- dependency-name: faker
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>
2 years ago
f12afa177e
Bump rqrcode from 2.1.1 to 2.1.2 ( #18897 )
...
Bumps [rqrcode](https://github.com/whomwah/rqrcode ) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/whomwah/rqrcode/releases )
- [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whomwah/rqrcode/compare/v2.1.1...v2.1.2 )
---
updated-dependencies:
- dependency-name: rqrcode
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>
2 years ago
1f611d6ffb
Bump oj from 3.13.17 to 3.13.18 ( #18896 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.17 to 3.13.18.
- [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.17...v3.13.18 )
---
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>
2 years ago
d52afaa6c7
Bump nokogiri from 1.13.7 to 1.13.8 ( #18882 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.7 to 1.13.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.7...v1.13.8 )
---
updated-dependencies:
- dependency-name: nokogiri
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>
2 years ago
f305bd2c76
Bump eslint-plugin-jsx-a11y from 6.6.0 to 6.6.1 ( #18884 )
...
Bumps [eslint-plugin-jsx-a11y](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y ) from 6.6.0 to 6.6.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/releases )
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/CHANGELOG.md )
- [Commits](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/compare/v6.6.0...v6.6.1 )
---
updated-dependencies:
- dependency-name: eslint-plugin-jsx-a11y
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>
2 years ago
3bc3a172eb
Bump sass from 1.53.0 to 1.54.0 ( #18881 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.53.0 to 1.54.0.
- [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.53.0...1.54.0 )
---
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>
2 years ago
f174ce1048
Use slightly more margin between post buttons (under compose box) ( #1816 )
2 years ago
3a7c641dd4
Merge pull request #1815 from ClearlyClaire/glitch-soc/features/upstream-cw-reveal
...
Add option to share CW toggle state across instances of a post
2 years ago
18346f4044
Add option to share CW toggle state across instances of a post
2 years ago
eacde1a130
Regroup CW unfolding settings in their own section
2 years ago
82f1e0945e
Merge pull request #1813 from ClearlyClaire/glitch-soc/features/out-of-content-media
...
Add local setting toggle to move media attachments outside CWs
2 years ago
a5f81e1abd
Improve interaction between out-of-CW attachments and collapsed toots
2 years ago
db5b44330d
Add explanation for some options in the local settings dialog
2 years ago
3f4e27ab6f
Add local setting toggle to move media attachments outside CWs
...
Fixes #1812
2 years ago
85d0e34745
Merge pull request #1810 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
1ceebf2710
[Glitch] Change hashtag numbers to have clearer labels in web UI
...
Port f5d8501138
2 years ago
969d805e86
[Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
...
Port d5ca204e89
2 years ago
9608e720a4
Add ability to follow hashtags in web UI ( #18862 )
2 years ago
d799fe2082
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
76ff452306
Fix unicode regression in #18809 ( #18863 )
2 years ago
f5d8501138
Change hashtag numbers to have clearer labels in web UI ( #18864 )
2 years ago
726931fe4a
Fix /api/v1/tags/:id route constraints ( #18854 )
...
The constraint was applied prior to decoding, and rejected anything containing
the '%' character, which would be used for anything with non-ASCII unicode
characters.
2 years ago
f8b3e36929
New Crowdin updates ( #18810 )
...
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations en.json (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Thai)
* New translations activerecord.en.yml (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Icelandic)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Romanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Polish)
* New translations en.yml (Esperanto)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Hungarian)
* New translations activerecord.en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Chinese Simplified)
* Run `bundle exec i18n-tasks normalize`
* Fix syntax
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
c87534b813
Bump ws from 8.8.0 to 8.8.1 ( #18836 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.8.0 to 8.8.1.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.8.0...8.8.1 )
---
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>
2 years ago
d5ca204e89
Bump react-redux-loading-bar from 4.0.8 to 5.0.4 ( #18562 )
2 years ago
a44ea8af53
Bump @babel/plugin-transform-runtime from 7.18.6 to 7.18.9 ( #18841 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.18.6 to 7.18.9.
- [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.18.9/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>
2 years ago
085ce95dc2
Bump @babel/core from 7.18.6 to 7.18.9 ( #18834 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.18.6 to 7.18.9.
- [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.18.9/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
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>
2 years ago
21a536a16e
Bump jest from 28.1.2 to 28.1.3 ( #18832 )
...
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest ) from 28.1.2 to 28.1.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/commits/v28.1.3/packages/jest )
---
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>
2 years ago
f290be71e0
Bump @babel/plugin-proposal-decorators from 7.18.6 to 7.18.9 ( #18837 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.18.6 to 7.18.9.
- [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.18.9/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>
2 years ago
f8835387ea
Bump react-toggle from 4.1.2 to 4.1.3 ( #18839 )
...
Bumps [react-toggle](https://github.com/aaronshaf/react-toggle ) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/aaronshaf/react-toggle/releases )
- [Changelog](https://github.com/aaronshaf/react-toggle/blob/master/CHANGELOG.md )
- [Commits](https://github.com/aaronshaf/react-toggle/commits )
---
updated-dependencies:
- dependency-name: react-toggle
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>
2 years ago
d7595ce333
Bump oj from 3.13.16 to 3.13.17 ( #18835 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.16 to 3.13.17.
- [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.16...v3.13.17 )
---
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>
2 years ago
e37a792c36
Bump jest-environment-jsdom from 28.1.2 to 28.1.3 ( #18840 )
...
Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom ) from 28.1.2 to 28.1.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/commits/v28.1.3/packages/jest-environment-jsdom )
---
updated-dependencies:
- dependency-name: jest-environment-jsdom
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>
2 years ago
22755e621b
Bump nokogiri from 1.13.6 to 1.13.7 ( #18843 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.6 to 1.13.7.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.6...v1.13.7 )
---
updated-dependencies:
- dependency-name: nokogiri
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>
2 years ago
bd9095fcfa
Bump @babel/eslint-parser from 7.18.2 to 7.18.9 ( #18842 )
...
Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser ) from 7.18.2 to 7.18.9.
- [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.18.9/eslint/babel-eslint-parser )
---
updated-dependencies:
- dependency-name: "@babel/eslint-parser"
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>
2 years ago
e8e65c10bc
Bump babel-jest from 28.1.2 to 28.1.3 ( #18838 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 28.1.2 to 28.1.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/commits/v28.1.3/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>
2 years ago
e8207d9840
Bump @babel/runtime from 7.18.6 to 7.18.9 ( #18833 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.18.6 to 7.18.9.
- [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.18.9/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/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>
2 years ago
bcc6510f53
Bump @babel/preset-env from 7.18.6 to 7.18.9 ( #18830 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.18.6 to 7.18.9.
- [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.18.9/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
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>
2 years ago
8a67e6e237
Bump terser from 4.8.0 to 4.8.1 ( #18849 )
...
Bumps [terser](https://github.com/terser/terser ) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases )
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/terser/terser/commits )
---
updated-dependencies:
- dependency-name: terser
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
0a61b000e3
Merge pull request #1807 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
7205098ccf
[Glitch] Fix badge color not affected
...
Port f248d95be2
2 years ago
3a516acfc2
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
f248d95be2
Fix badge color not affected ( #18826 )
...
* Fix badge color not affected
* Generate user role css
2 years ago
ec83e2a35e
Fix missing scope for current_user in _sidebar.html.haml ( #18822 )
...
Fixes https://github.com/mastodon/mastodon/issues/18821
Fix suggested by https://miaow.gay/@meganeko/108665430982072358
2 years ago
ad489f865a
Fix custom.css html escaped ( #18824 )
2 years ago
ab1488a6ad
Merge pull request #1804 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
6c0d73a675
Change default values for emoji limits in .env.production.sample and comment them out
2 years ago
cd87d7dcef
Merge branch 'main' into glitch-soc/merge-upstream
...
- `.env.production.sample`:
Our sample config file is very different from upstream since it is much more
complete. Upstream added documentation for a few env variables.
Copied the new variables/documentation from upstream.
- `app/lib/feed_manager.rb`:
Upstream added a timeline type (hashtags), while glitch-soc already had an
extra one (direct messages). Not really a conflict but textually close
changes.
Ported upstream's changes.
- `app/models/custom_emoji.rb`:
Upstream upped the custom emoji size limit, while glitch-soc had configurable
limits.
Upped the default limits accordingly.
- `streaming/index.js`:
Upstream reworked how hastags were normalized. Minor conflict due to
glitch-soc's handling of instance-local posts.
Ported upstream's changes.
2 years ago
c3f0621a59
Add ability to follow hashtags ( #18809 )
2 years ago
dependabot[bot]
Mélanie Chauvel
Claire
Eugen Rochko
Yamagishi Kazutoshi
Jeong Arm
Jeremy Kescher