me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39663 commits 2 branches 0 tags 429 MiB
Commit graph

39663 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexandra Catalina
777075f322 Update tootsuite/mastodon Docker tag to v3.4.4 (#17065) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
 2021-11-27 03:06:39 +01:00
Alexandra Catalina
af93d938d4
Update tootsuite/mastodon Docker tag to v3.4.4 (#17065) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
 2021-11-27 03:06:39 +01:00
Claire
30c2546463 Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 23:41:01 +01:00
Claire
4aec8087c7
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 23:41:01 +01:00
Claire
b22b76a571 [Glitch] Fix searching for additional hashtags in hashtag column 
Port 5305dada6c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-26 22:58:46 +01:00
Claire
ca5d78816b [Glitch] Fix searching for additional hashtags in hashtag column 
Port 3f382e337d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-26 22:58:46 +01:00
Claire
9565dc366d [Glitch] Fix color of hashtag column settings inputs 
Port 986391cd19 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-26 22:58:13 +01:00
Claire
d5d44b431a [Glitch] Fix color of hashtag column settings inputs 
Port 1630807ee2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-26 22:58:13 +01:00
Claire
759226e116 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
 2021-11-26 22:53:55 +01:00
Claire
9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
 2021-11-26 22:53:55 +01:00
Jeong Arm
5ac17e3a77 Fix admin statuses order(#16937) (#16969) 
* Fix #16937

* Add test for statuses order
 2021-11-26 22:12:27 +01:00
Jeong Arm
1c826471e7
Fix admin statuses order(#16937) (#16969) 
* Fix #16937

* Add test for statuses order
 2021-11-26 22:12:27 +01:00
Claire
5305dada6c Fix searching for additional hashtags in hashtag column (#17054) 2021-11-26 22:11:09 +01:00
Claire
3f382e337d
Fix searching for additional hashtags in hashtag column (#17054) 2021-11-26 22:11:09 +01:00
Claire
986391cd19 Fix color of hashtag column settings inputs (#17058) 
Fixes #17057
 2021-11-26 22:09:11 +01:00
Claire
1630807ee2
Fix color of hashtag column settings inputs (#17058) 
Fixes #17057
 2021-11-26 22:09:11 +01:00
Takeshi Umeda
3b1320f817 Fix performance of tootctl statuses remove (#17052) 
* Fix performance of tootctl statuses remove

* Fix model class
 2021-11-26 22:08:47 +01:00
Takeshi Umeda
0ac7efdc50
Fix performance of tootctl statuses remove (#17052) 
* Fix performance of tootctl statuses remove

* Fix model class
 2021-11-26 22:08:47 +01:00
Claire
ad3668eb5f Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060) 
Fixes #16799
 2021-11-26 22:04:09 +01:00
Claire
ddcb9da74f
Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060) 
Fixes #16799
 2021-11-26 22:04:09 +01:00
zunda
9270b90d38 Upgrade bootsnap for Ruby 3.0.3 (#17064) 
https://github.com/Shopify/bootsnap/blob/v1.9.3/CHANGELOG.md#193
 2021-11-26 22:03:35 +01:00
zunda
912c6b3f49
Upgrade bootsnap for Ruby 3.0.3 (#17064) 
https://github.com/Shopify/bootsnap/blob/v1.9.3/CHANGELOG.md#193
 2021-11-26 22:03:35 +01:00
Jeong Arm
849a007a2c [Glitch] Port upstream changes about trending links 2021-11-26 11:36:22 +01:00
Jeong Arm
97151840b0 [Glitch] Port upstream changes about trending links 2021-11-26 11:36:22 +01:00
Takeshi Umeda
8b87566072 Fix ElasticSearch to Elasticsearch (#17050) 2021-11-26 08:30:02 +01:00
Takeshi Umeda
06631fdc53
Fix ElasticSearch to Elasticsearch (#17050) 2021-11-26 08:30:02 +01:00
OSAMU SATO
20ad635c3c Add batch_size option to bin/tootctl search deploy (#17049) 2021-11-26 08:29:53 +01:00
OSAMU SATO
53aca8aecf
Add batch_size option to bin/tootctl search deploy (#17049) 2021-11-26 08:29:53 +01:00
dependabot[bot]
8b8da5c8f3 Bump sprockets-rails from 3.4.0 to 3.4.1 (#17021) 
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/rails/sprockets-rails/releases)
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.0...v3.4.1)

---
updated-dependencies:
- dependency-name: sprockets-rails
  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-11-26 14:06:23 +09:00
dependabot[bot]
0909874c08 Bump sprockets-rails from 3.4.0 to 3.4.1 (#17021) 
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/rails/sprockets-rails/releases)
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.0...v3.4.1)

---
updated-dependencies:
- dependency-name: sprockets-rails
  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-11-26 14:06:23 +09:00
dependabot[bot]
7c5b119453 Bump eslint-plugin-react from 7.27.0 to 7.27.1 (#17022) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.27.0 to 7.27.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.27.0...v7.27.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-11-26 14:06:12 +09:00
dependabot[bot]
45f8eb110a
Bump eslint-plugin-react from 7.27.0 to 7.27.1 (#17022) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.27.0 to 7.27.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.27.0...v7.27.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-11-26 14:06:12 +09:00
dependabot[bot]
cc64f5f48f Bump reselect from 4.1.2 to 4.1.4 (#17025) 
Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/reduxjs/reselect/releases)
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.2...v4.1.4)

---
updated-dependencies:
- dependency-name: reselect
  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-11-26 14:01:53 +09:00
dependabot[bot]
5b8928fef9
Bump reselect from 4.1.2 to 4.1.4 (#17025) 
Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/reduxjs/reselect/releases)
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.2...v4.1.4)

---
updated-dependencies:
- dependency-name: reselect
  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-11-26 14:01:53 +09:00
dependabot[bot]
56e58ef522 Bump @babel/plugin-proposal-decorators from 7.16.0 to 7.16.4 (#17027) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.16.0 to 7.16.4.
- [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.4/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-11-26 14:01:31 +09:00
dependabot[bot]
9a77a16087
Bump @babel/plugin-proposal-decorators from 7.16.0 to 7.16.4 (#17027) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.16.0 to 7.16.4.
- [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.4/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-11-26 14:01:31 +09:00
Eugen Rochko
4375813ea7 Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
Eugen Rochko
7de0ee7aba
Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
Claire
975d5f138e Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 01:25:29 +01:00
Claire
025a2ceb0f
Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 01:25:29 +01:00
Claire
aa9e32af3d Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 01:15:32 +01:00
Claire
3304df0ab5 Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 01:15:32 +01:00
Claire
61510d37d4 Revert "Fix trends admin page crashing" 
This reverts commit 367a3ca2cb.
 2021-11-26 01:15:29 +01:00
Claire
afd71867ba Revert "Fix trends admin page crashing" 
This reverts commit 5f10e64330.
 2021-11-26 01:15:29 +01:00
Eugen Rochko
6c1d78b277 Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044) 2021-11-26 01:12:39 +01:00
Eugen Rochko
12b3ff6c6d
Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044) 2021-11-26 01:12:39 +01:00
Claire
e4abde9106 Merge pull request #1636 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 01:12:09 +01:00
Claire
b4f785c1f4
Merge pull request #1636 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 01:12:09 +01:00
Claire
367a3ca2cb Fix trends admin page crashing 2021-11-26 00:50:13 +01:00
Claire
5f10e64330 Fix trends admin page crashing 2021-11-26 00:50:13 +01:00