430d442791
Merge pull request #1661 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-17 10:01:02 +01:00
77dd4ab8f5
Fix `pinned` attribute not being set for private self-posts
2022-01-17 09:52:19 +01:00
5effc0f8fa
[Glitch] Add support for private pinned posts
...
Port JS changes from d5c9feb7b7
2022-01-17 08:35:27 +01:00
2d4b4b0b45
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Upstream introduced support for private pinned toots, but glitch-soc's query
was a bit different as it filtered out local-only toots.
Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
Not a real conflict, but the line below was different in glitch-soc due to
the configurable pinned toots limit.
2022-01-17 08:28:52 +01:00
d5c9feb7b7
Add support for private pinned posts ( #16954 )
...
* Add support for private pinned toots
* Allow local user to pin private toots
* Change wording to avoid "direct message"
2022-01-17 00:49:55 +01:00
a85912b0d6
Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-16 22:39:35 +01:00
278bd61d6f
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-16 22:29:05 +01:00
081e4426f8
Fix admin interface crash when displaying deleted user ( #17301 )
2022-01-16 20:57:37 +01:00
474cd302c9
[Glitch] Gradually increase retry waiting for media processing
...
Port bc7a8ae6d6
2022-01-16 18:14:33 +01:00
b61c3ddff8
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added some text, but our README is completely different.
Kept our README unchanged.
2022-01-16 18:11:20 +01:00
462bc65112
Add line about using vagrant-hostsupdater in the Vagrant short guide ( #17243 )
...
This is documented in the Vagrantfile, but not in the README. As far as I know,
following the short guide without installing this plugin will not make the
container accessible at mastodon.local, thus breaking the last step of the
guide.
2022-01-16 16:55:41 +01:00
8e84ebf0cb
Remove IP tracking columns from users table ( #16409 )
2022-01-16 13:23:50 +01:00
b52fdb4c6f
Fix SMTP_ENABLE_STARTTLS_AUTO/SMTP_TLS/SMTP_SSL environment variables don't work ( #17216 )
...
#17215
2022-01-13 12:05:22 +01:00
07cb948f39
Remove reference to dev.glitch.social from README
...
Fixes #1584
It's been down for a while.
2022-01-10 20:59:26 +01:00
ea61d3acd6
Fix media API limit ( #17272 )
2022-01-10 14:25:24 +01:00
bc7a8ae6d6
Gradually increase retry waiting for media processing ( #17271 )
2022-01-10 14:25:08 +01:00
3dc0357d9e
helm: upgrade elasticsearch to 7.x ( #17262 )
2022-01-09 03:21:19 +01:00
5b185b05f1
Merge pull request #1655 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-07 22:43:28 +01:00
af86c7a5de
[Glitch] Fix media descriptions not being used for client-side filtering
...
Port 37e80994f8
2022-01-07 19:54:58 +01:00
fca50e4b50
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-07 19:51:47 +01:00
bc066d8936
Fix timeline streaming stopping for multiple sessions instead of one ( #17259 )
...
* Fix timeline streaming stopping for multiple sessions instead of one
Fixes #17256 .
In updating the code for a newer version of node-redis, #17183 also broke
redis subscription management when multiple streaming clients subscribe to the
same channel.
This commit restores the redis subscription management code.
* Let node-redis actually handle the subscriptions
2022-01-07 19:50:12 +01:00
e002f32336
Bump rspec_junit_formatter from 0.4.1 to 0.5.0 ( #17249 )
...
Bumps [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter ) from 0.4.1 to 0.5.0.
- [Release notes](https://github.com/sj26/rspec_junit_formatter/releases )
- [Changelog](https://github.com/sj26/rspec_junit_formatter/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sj26/rspec_junit_formatter/compare/v0.4.1...v0.5.0 )
---
updated-dependencies:
- dependency-name: rspec_junit_formatter
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>
2022-01-06 10:35:42 +09:00
5339af0efb
Bump @babel/plugin-transform-react-inline-elements from 7.16.5 to 7.16.7 ( #17233 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.16.5 to 7.16.7.
- [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.16.7/packages/babel-plugin-transform-react-inline-elements )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-react-inline-elements"
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>
2022-01-06 10:35:23 +09:00
0dcb8f6e37
Bump eslint-plugin-react from 7.27.1 to 7.28.0 ( #17200 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.27.1 to 7.28.0.
- [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.27.1...v7.28.0 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
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>
2022-01-06 10:28:18 +09:00
de7f68d11c
Bump oj from 3.13.10 to 3.13.11 ( #17251 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.13.10 to 3.13.11.
- [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.10...v3.13.11 )
---
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>
2022-01-06 10:27:30 +09:00
69acb8faea
Bump rubocop from 1.23.0 to 1.24.1 ( #17228 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.23.0 to 1.24.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.23.0...v1.24.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>
2022-01-06 10:26:53 +09:00
609dc96ebe
Bump @babel/core from 7.16.5 to 7.16.7 ( #17238 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.16.5 to 7.16.7.
- [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.16.7/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>
2022-01-06 10:25:52 +09:00
3fa903fcf1
Bump @babel/preset-react from 7.16.5 to 7.16.7 ( #17235 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.16.5 to 7.16.7.
- [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.16.7/packages/babel-preset-react )
---
updated-dependencies:
- dependency-name: "@babel/preset-react"
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>
2022-01-06 10:25:38 +09:00
b10933e1f6
Bump @babel/plugin-transform-runtime from 7.16.5 to 7.16.7 ( #17239 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.5 to 7.16.7.
- [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.16.7/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>
2022-01-06 10:25:22 +09:00
b1e5ba09d4
Bump bufferutil from 4.0.5 to 4.0.6 ( #17225 )
...
Bumps [bufferutil](https://github.com/websockets/bufferutil ) from 4.0.5 to 4.0.6.
- [Release notes](https://github.com/websockets/bufferutil/releases )
- [Commits](https://github.com/websockets/bufferutil/compare/v4.0.5...v4.0.6 )
---
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>
2022-01-06 10:14:35 +09:00
d5662b18af
Bump sass from 1.45.1 to 1.45.2 ( #17237 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.45.1 to 1.45.2.
- [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.45.1...1.45.2 )
---
updated-dependencies:
- dependency-name: sass
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>
2022-01-06 10:11:25 +09:00
05d14a9956
Bump @babel/plugin-proposal-decorators from 7.16.5 to 7.16.7 ( #17229 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.16.5 to 7.16.7.
- [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.16.7/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>
2022-01-06 10:10:00 +09:00
7ac14a44be
Bump i18n-tasks from 0.9.35 to 0.9.37 ( #17227 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.35 to 0.9.37.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.35...v0.9.37 )
---
updated-dependencies:
- dependency-name: i18n-tasks
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>
2022-01-06 10:01:31 +09:00
51c46c8bd6
Bump @babel/runtime from 7.16.5 to 7.16.7 ( #17236 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.16.5 to 7.16.7.
- [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.16.7/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>
2022-01-06 09:58:12 +09:00
a1b50a8a70
Bump eslint-plugin-import from 2.25.3 to 2.25.4 ( #17234 )
...
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import ) from 2.25.3 to 2.25.4.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases )
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md )
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.3...v2.25.4 )
---
updated-dependencies:
- dependency-name: eslint-plugin-import
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>
2022-01-06 09:56:33 +09:00
f96282f56e
Bump utf-8-validate from 5.0.7 to 5.0.8 ( #17231 )
...
Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate ) from 5.0.7 to 5.0.8.
- [Release notes](https://github.com/websockets/utf-8-validate/releases )
- [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.7...v5.0.8 )
---
updated-dependencies:
- dependency-name: utf-8-validate
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>
2022-01-06 09:56:20 +09:00
f82eaf531b
Bump @babel/preset-env from 7.16.5 to 7.16.7 ( #17230 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.16.5 to 7.16.7.
- [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.16.7/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>
2022-01-06 09:55:17 +09:00
a2ad0b0457
Bump yargs from 17.3.0 to 17.3.1 ( #17199 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 17.3.0 to 17.3.1.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v17.3.0...v17.3.1 )
---
updated-dependencies:
- dependency-name: yargs
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>
2022-01-06 09:54:51 +09:00
e8552007da
Bump kaminari from 1.2.1 to 1.2.2 ( #17197 )
...
Bumps [kaminari](https://github.com/kaminari/kaminari ) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/kaminari/kaminari/releases )
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kaminari/kaminari/compare/v1.2.1...v1.2.2 )
---
updated-dependencies:
- dependency-name: kaminari
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>
2022-01-06 09:54:38 +09:00
cb499882dc
Bump rubocop-rails from 2.12.4 to 2.13.0 ( #17195 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.12.4 to 2.13.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.12.4...v2.13.0 )
---
updated-dependencies:
- dependency-name: rubocop-rails
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>
2022-01-06 09:51:46 +09:00
d3db2eb7fb
Remove custom emojis on domain purge ( #17210 )
2021-12-30 08:41:09 +01:00
37e80994f8
Fix media descriptions not being used for client-side filtering ( #17206 )
...
Fix oversight in #13837
2021-12-28 23:25:50 +01:00
e2933854ac
Merge pull request #1653 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-12-27 16:46:38 +01:00
f011787003
[Glitch] Fix tag rendering error in hashtag column settings
...
Port e65080181a
2021-12-27 15:22:12 +01:00
09c61e1376
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
We have completely different contents. Kept our version.
- `package.json`:
Not a real conflict, just an upstream dependency udpated
textually too close to a glitch-soc-only dependency.
Updated dependencies like upstream.
- `streaming/index.js`:
Conflict due to code style changes on parts that were
modified in glitch-soc to handle local-only toots.
Changed style according to upstream.
2021-12-27 15:16:18 +01:00
fe71548844
Fix warnings on Rails boot ( #16946 )
2021-12-27 00:47:20 +01:00
e65080181a
Fix tag rendering error in hashtag column settings ( #17184 )
...
* Flatten tags in configuration to regular array before converting to JSON
* Render filter tags using toJS instead of toJSON
2021-12-26 19:22:05 +01:00
d78ddb1cea
Modify Readme syntax ( #17112 )
...
* Modify syntax
* Change ** bold to ### header
* Revert license edit
2021-12-25 22:55:31 +01:00
4d1eaf3e6e
Finish update of node-redis ( #17183 )
...
* fix streaming redis client
* use console.error instead of console.log
* follow node-redis migration guide
https://github.com/redis/node-redis/blob/master/docs/v3-to-v4.md
* fix config options for node-redis
* keep indentation
* Update streaming/index.js
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-12-25 22:55:06 +01:00
fad37dd1bc
Save bundle config as local ( #17188 )
...
Some bundle options are saved as global user config and not project local.
Specially, `deployment` must be saved as local config to be run on copied environment
2021-12-25 22:52:24 +01:00
Claire