mirrors
/
catstodon
mirror of https://git.kescher.at/CatCatNya/catstodon.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity
17,698 Commits
5 Branches
114 Tags
270 MiB
develop
main
essem/emoji-reactions-plus-upstream
merge/emoji-reactions
merge/filtering
v4.3.0-alpha.3+glitch+cat+1.2.2
v4.3.0-alpha.3+glitch+cat+1.2.1
v4.3.0-alpha.3+glitch+cat+1.2.0
v4.3.0-alpha.3+glitch+cat+1.1.3
v4.3.0-alpha.3+glitch+cat+1.1.2
v4.3.0-alpha.3+glitch+cat+1.1.1
v4.3.0-alpha.3+glitch+cat+1.1.0
v4.3.0-alpha.3+glitch+cat+1.0.9
v4.3.0-alpha.3+glitch+cat+1.0.8
v4.3.0-alpha.3+glitch+cat+1.0.7
v4.3.0-alpha.3+glitch+cat+1.0.6
v4.3.0-alpha.3+glitch+cat+1.0.5
v4.3.0-alpha.3+glitch+cat+1.0.4
v4.3.0-alpha.3+glitch+cat+1.0.3
v4.3.0-alpha.3+glitch+cat+1.0.2
v4.3.0-alpha.3+glitch+cat+1.0.1
v4.3.0-alpha.3+glitch+cat+1.0.0
v4.3.0-alpha.2+glitch+cat+1.0.18
v4.3.0-alpha.1+glitch+cat+1.0.17
v4.3.0-alpha.1+glitch+cat+1.0.16
v4.3.0-alpha.1+glitch+cat+1.0.15
v4.3.0-alpha.0+glitch+cat+1.0.14
v4.3.0-alpha.0+glitch+cat+1.0.13
v4.3.0-alpha.0+glitch+cat+1.0.12
v4.3.0-alpha.0+glitch+cat+1.0.11
v4.3.0-alpha.0+glitch+cat+1.0.10
v4.3.0-alpha.0+glitch+cat+1.0.9
v4.3.0-alpha.0+glitch+cat+1.0.8
v4.3.0-alpha.0+glitch+cat+1.0.7
v4.3.0-alpha.0+glitch+cat+1.0.6
v4.3.0-alpha.0+glitch+cat+1.0.5
v4.3.0-alpha.0+glitch+cat+1.0.4
v4.3.0-alpha.0+glitch+cat+1.0.3
v4.3.0-alpha.0+glitch+cat+1.0.2
v4.3.0+1.0.1
v4.3.0+1.0.0
4.0.1+1.0.0
4.0.1+1.0.1
4.0.1+1.0.2
4.0.1+1.0.3
4.0.1+1.0.4
v3.5.3+1.0.0
v3.5.3+1.0.1
v3.5.3+1.0.3
v3.5.3+1.0.4
v3.5.3+1.0.5
v3.5.3+1.0.6
v3.5.3+1.0.7
v3.5.3+1.0.8
v3.5.3+1.0.9
v3.5.3+1.1.0
v3.5.3+1.1.1
v3.5.3+1.1.2
v3.5.3+1.1.3
v3.5.3+1.1.4
v3.5.3+1.1.5
v3.5.3+1.1.6
v3.5.3+1.2.1
v3.5.3+1.2.2
v3.5.3+1.2.3
v4.0.0+1.0.0
v4.0.2+1.0.0
v4.0.2+1.0.1
v4.0.2+1.0.10
v4.0.2+1.0.11
v4.0.2+1.0.12
v4.0.2+1.0.13
v4.0.2+1.0.2
v4.0.2+1.0.3
v4.0.2+1.0.4
v4.0.2+1.0.5
v4.0.2+1.0.6
v4.0.2+1.0.7
v4.0.2+1.0.8
v4.0.2+1.0.9
v4.0.2+1.1.0
v4.0.2+1.1.1
v4.0.2+1.1.2
v4.0.2+1.1.3
v4.0.2+1.1.4
v4.0.2+1.1.5
v4.0.2+1.1.6
v4.0.2+1.1.7
v4.0.2+1.1.8
v4.0.2+1.1.9
v4.1.0+1.0.0
v4.1.0+1.0.1
v4.1.0+2.0.0
v4.1.0+2.0.1
v4.1.0+2.0.2
v4.1.0+2.0.4
v4.1.0+2.0.5
v4.1.0+2.1.0
v4.1.0+2.1.1
v4.1.1+1.0.0
v4.1.1+1.0.1
v4.1.1+1.0.2
v4.1.1+1.0.3
v4.1.1+1.0.4
v4.1.1+1.0.5
v4.1.1+1.0.6
v4.1.1+1.0.7
v4.1.2+1.0.0
v4.1.2+1.0.1
v4.1.2+1.0.2
v4.1.2+1.0.3
v4.1.2+1.0.4
v4.1.2+1.1.0
v4.1.2+1.1.1
v4.1.2+1.1.2
v4.1.2+1.1.3
v4.1.2+1.1.4
v4.1.3+1.0.0
v4.1.4+1.0.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'abc56dff2c'
${ noResults }
Commit Graph

17698 Commits (abc56dff2c202d45e4ca3e6605d07b69143a34d4)
 

Author SHA1 Message Date
Jeremy Kescher abc56dff2c
Update CatCatNya~ prod config 1 year ago
Jeremy Kescher fd351e4b3c
Move back to Ruby 3.2.1 
Previous commit fixes the issue, so we move back to Ruby 3.2.1.
 1 year ago
Jean Boussier 03a96ba2e1 Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 
Fix: https://github.com/mastodon/mastodon/issues/23644

As mentioned on that other thread, the issue arise when a `Status`
is created with SHAPE_TOO_COMPLEX making the instance variable ordering
unpredictable.

But we can sidestep that issue using code inspired from Shopify/paquito.

I added some code in the test environment initializer to cause this
issue to be reproduced and prove this change fixes it.

This code is also easily converted into a monkey patch.
 1 year ago
Jeremy Kescher 080569b3fd
Remove fetch_value issue logging 
Since we've moved back to Ruby 3.1.3 in 9aa172f7df and the issue only occurs on Ruby 3.2.1 due to the marshaller changing the ordering of instance variables, as explained by byroot / casperisfine in https://github.com/mastodon/mastodon/issues/23644#issuecomment-1472637530.

As such, we no longer need this logging, and should be able to upgrade past Ruby 3.1 once the marshaller does ordering correctly again or Rails is changed to do custom marshalling.
 1 year ago
Jeremy Kescher 24e9a23fe6
Merge remote-tracking branch 'upstream/main' into develop, bump version 
Conflicts:
- .github/workflows/build-image.yml
  We're not building an image with GitHub Actions.
 1 year ago
Jeremy Kescher 9aa172f7df
Move back to Ruby 3.1.3 1 year ago
Claire f5daa20f2a
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 1 year ago
Jeremy Kescher ddc4022845
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/initial_state.js
#	app/javascript/mastodon/initial_state.js
#	app/lib/feed_manager.rb
#	app/services/batched_remove_status_service.rb
#	lib/mastodon/feeds_cli.rb
 1 year ago
Rodion Borisov 32418f0ff3 [Glitch] Center the text itself in upload area 
Port a52ccd7ad9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 1 year ago
PauloVilarinho 17fb58bff3 [Glitch] add modal message when editing toot 
Port 8770473dbb to glitch-soc

Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 1 year ago
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
 1 year ago
Claire 6a0ed45aa3
Merge pull request #2122 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 1 year ago
Nick Schonning 75131e7bf7
Setup haml-lint CI with todo config (#23524) 1 year ago
Claire a232a1feb8
Fix misleading error code when receiving invalid WebAuthn credentials (#23568) 1 year ago
Claire cf50667e26
Fix incorrect post links in strikes when the account is remote (#23611) 1 year ago
Claire 9875be09fe
Fix dashboard crash on ElasticSearch server error (#23751) 1 year ago
Nick Schonning 15fdd94e2f
Update PostCSS dependencies (#23835) 1 year ago
Matt Jankowski a471e1c48f
Add spec for the CLI `version` task (#23978) 1 year ago
CSDUMMI 39c7236649
Redirect users to SLO at the IdP after logging them out of Mastodon. (#24020) 1 year ago
Claire 1d0ad558ff
Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 1 year ago
Nick Schonning ed887271f3
Skip Docker CI Login/Push on forks (#23564) 1 year ago
Renaud Chaput 50d39c275d
Push Docker images to Github Container Registry as well (#24101) 1 year ago
dependabot[bot] f4f3e2b46e
Bump rubocop from 1.48.0 to 1.48.1 (#24095) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
dependabot[bot] 5b39d20804
Bump rails from 6.1.7.2 to 6.1.7.3 (#24096) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
dependabot[bot] 82d7b08fcf
Bump rack from 2.2.6.3 to 2.2.6.4 (#24097) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
CSDUMMI 5dee40b5f5
Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064) 1 year ago
Jeremy Kescher b457636e9a
Update fetch_value logging patch 
https://github.com/mastodon/mastodon/issues/23644#issuecomment-1461863404
 1 year ago
Jeremy Kescher d092a01cea
Use Rails.logger.warn instead of puts 1 year ago
Jeremy Kescher 2d076504d9
Log what's causing the fetch_value errors. 
Port of https://github.com/mastodon/mastodon/issues/23644#issuecomment-1461863404
 1 year ago
dependabot[bot] 43ec9d24f9
Bump pghero from 3.2.0 to 3.3.0 (#24085) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
dependabot[bot] 245f0aead2
Bump jsdom from 21.1.0 to 21.1.1 (#24090) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
CSDUMMI d258ec8e3b
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller (#24073) 1 year ago
Nick Schonning e762a14c0a
Enable Rubocop Performance/DeleteSuffix (#24077) 1 year ago
Claire f432db7b9f
Fix sidekiq jobs not triggering Elasticsearch index updates (#24046) 1 year ago
Matt Jankowski 1ed12d5e2f
Add basic search specs for chewy indexes (#24065) 1 year ago
Nick Schonning 3ea0856f70
Enable RSpec/FilePath (#23965) 1 year ago
dependabot[bot] 8931f18a21
Bump eslint from 8.33.0 to 8.35.0 (#24049) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
dependabot[bot] 540d49ec14
Bump pghero from 3.1.0 to 3.2.0 (#24044) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
Matt Jankowski 688287c59d
Coverage improvement round-out following up previous work (#23987) 1 year ago
Matt Jankowski 56bddfbfa3
Serializers spec coverage (#24017) 1 year ago
dependabot[bot] 53309fa31a
Bump puma from 6.1.0 to 6.1.1 (#24045) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
Nick Schonning 4fa542f3c4
Sync CI and Docker Compose image versions (#24053) 1 year ago
Rodion Borisov a52ccd7ad9
Center the text itself in upload area (#24029) 1 year ago
Matt Jankowski 2f7a663b0b
Explicitly set github repo in instance presenter spec (#24036) 1 year ago
Christian Schmidt 684a970b3c
Unescape HTML entities (#24019) 1 year ago
Nick Schonning 9dfe2dbd3f
Skip rebase-needed job for i10n branch (#24026) 1 year ago
9p4 b715bd8e53
Add refreshing many accounts at once with "tootctl accounts refresh" (#23304) 1 year ago
dependabot[bot] 0bc1a002fd
Bump babel-jest from 29.4.3 to 29.5.0 (#24007) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
dependabot[bot] f47c404f88
Bump mkdirp from 2.1.3 to 2.1.5 (#23994) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago
dependabot[bot] 60d664eab8
Bump rubocop from 1.45.1 to 1.48.0 (#23999) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 1 year ago