sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity
19,608 commits 2 branches 0 tags 263 MiB
Commit graph

1,085 commits

Author SHA1 Message Date
Claire
62620956d5 Merge commit '9a3d047f3e' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
Claire
fa65c8244f
 		Fix cache store pool config deprecation warnings (#27551) 2023-10-25 12:01:21 +00:00
Claire
4b0fb764c3 Merge commit 'e93a75f1a1' into glitch-soc/merge-upstream 
Conflicts and ported changes:
- updated `@rails/ujs` imports
 2023-10-24 19:59:19 +02:00
Claire
e25cc4deb7 Merge commit '379115e601' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
 2023-10-24 19:31:14 +02:00
Claire
e6c3d3c744 Merge commit 'd9503a1965' into glitch-soc/merge-upstream 2023-10-24 19:21:01 +02:00
Claire
57c0de949b Merge commit '8b770ce811' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.
 2023-10-24 19:17:20 +02:00
Matt Jankowski
e93a75f1a1
 		Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
Claire
379115e601
 		Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
Claire
79a63201a9
 		Fix Layout/EmptyLineAfterGuardClause issues caused by merging an old PR (#27512) 2023-10-23 16:21:48 +02:00
Claire
44edf3aa91
 		Improve error handling in mastodon:setup task (#21464) 2023-10-23 14:28:32 +02:00
Claire
63179f0bf4 Merge commit '5ef26d8fd5' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Matt Jankowski
65cd0700e4
 		Refactor domains cli to remove model call from regex (#25878) 2023-10-17 15:58:42 +02:00
Claire
ac2370778a Merge commit 'c676bc91e9' into glitch-soc/merge-upstream 
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
 2023-10-08 17:21:12 +02:00
Claire
d7fcd70023 Merge commit '2016c5d912' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
 2023-10-08 16:41:56 +02:00
Claire
19ebf7797e Merge commit 'e6b903b21e' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
Nick Schonning
8bb4706e11
 		Move migration_helpers Rubocop ignore to config (#24236) 2023-10-03 14:58:40 +02:00
Matt Jankowski
937dc42f10
 		Extract methods for file movement in CLI::Upgrade (#25120) 2023-09-28 16:04:05 +02:00
Claire
f0c720cfc9
 		Bump version to v4.3.0-alpha.0 (#27022) 2023-09-28 13:40:43 +02:00
Claire
abdb58840a Merge commit '57f592fed5' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
Claire
82eaa26d87
 		Update tootctl maintenance fix-duplicates to Mastodon v4.2.0 (#27147) 2023-09-26 11:11:52 +02:00
Claire
06444c86c7
 		Fix division by zero in video in bitrate computation code (#27129) 2023-09-25 17:07:52 +02:00
Claire
86ec1e833e Merge branch 'main' into glitch-soc/merge-upstream 2023-09-21 16:56:09 +02:00
Claire
4fcc026f0f
 		Bump version to v4.2.0 (#27017) 2023-09-21 16:51:32 +02:00
Claire
f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
 2023-09-21 15:12:00 +02:00
Claire
890e334703
 		Add migration tests for negative settings (#27012) 2023-09-21 12:33:30 +02:00
Claire
6a9e93ae19 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:32:48 +02:00
Claire
abcc0b38fa
 		Fix incorrect PostgreSQL version check (#26979) 2023-09-19 17:31:58 +02:00
Claire
f546b0c999 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:07:29 +02:00
Claire
f4b780ba22
 		Bump version to v4.2.0-rc2 (#26974) 2023-09-19 17:04:23 +02:00
Claire
22ee4e057d Merge commit 'a83615edc9' into glitch-soc/merge-upstream 
Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
 2023-09-19 12:59:23 +02:00
Eugen Rochko
0f3f9b611f
 		Change video bitrate to always fit within size limit (#26970) 2023-09-19 12:25:58 +02:00
Claire
5ed72f668f Merge commit 'b90383d073' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
Claire
e193c848fe Merge commit '97e4011c3c' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
 2023-09-15 21:25:05 +02:00
Claire
08b495d95c Merge commit 'b1d8907138' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire
3ca94f6d4a Merge commit '93d051e47d' into glitch-soc/merge-upstream 2023-09-15 20:21:40 +02:00
Claire
b90383d073
 		Bump version to v4.2.0-rc1 (#26916) 2023-09-14 18:46:00 +02:00
Jeong Arm
97f3d7b662
 		Fix Version metadata have trailing dot (#2403) 2023-09-13 08:47:39 +02:00
Jeong Arm
59af3c1310
 		Add PublicStatuses to tootctl search deploy --only option (#26896) 2023-09-12 09:59:59 +02:00
jsgoldstein
4d9186a48c
 		Add search tests (#26703) 2023-09-08 16:17:55 +02:00
Eugen Rochko
3a679844e4
 		Fix account_id, max_id and min_id params not working in search (#26847) 2023-09-08 14:25:00 +02:00
Claire
ec48bc3610
 		Do not truncate backtrace when the BACKTRACE env variable is set (#26794) 2023-09-06 09:18:10 +02:00
Claire
87b5f84625 Merge commit 'f80f426c57' into glitch-soc/merge-upstream 2023-09-05 08:14:52 +02:00
Claire
f80f426c57
 		Bump version to v4.2.0-beta3 (#26753) 2023-09-04 21:20:20 +02:00
Claire
e66f961e05 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-04 18:27:46 +02:00
Claire
cddef4c485
 		Fix language settings for users having selected the kmr language (#26787) 2023-09-04 17:56:31 +02:00
Claire
c107512fa6 Merge commit '05093266e6' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire
fbbe9f1c12 Merge commit 'a7d96e6aff' into glitch-soc/merge-upstream 2023-09-02 12:20:33 +02:00
Claire
3c7dbf3a16 Merge commit '5694e24bbf' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
 2023-09-02 11:56:09 +02:00
Claire
6b7c47311d Merge commit '072112867b' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00
Claire
16681e0f20
 		Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00