treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
17,384 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

17384 Commits (488cd37f1ae2298ea7e3e0e0f7c5816cfc7eed51)

Author SHA1 Message Date
Claire 488cd37f1a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
 2023-03-16 23:12:59 +01:00
Claire 769e8b2ad9 Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-03-16 23:09:53 +01:00
Nick Schonning c2821e2aa3 Ignore additional Style/OptionalBooleanParameter (#24138) 2023-03-16 23:07:25 +01:00
Claire 3b17f2f718 Add warning for object storage misconfiguration (#24137) 2023-03-16 22:47:01 +01:00
Eugen Rochko ef0c6a43ed Change user backups to use expiring URLs for download when possible (#24136) 2023-03-16 22:46:52 +01:00
Matt Jankowski 10a4c16256 Roll back unintentionally activated rubocop rules (#24132) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
 2023-03-16 22:24:01 +01:00
Eugen Rochko 83f302c101 New Crowdin updates (#23904) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-03-16 21:02:00 +09:00
Christian Schmidt 7583523bf0 Replace `Status#translatable?` with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
Eugen Rochko f0734513f4 Refactor monkey-patching of `PrivateAddressCheck` (#24122) 2023-03-16 04:33:38 +01:00
Nick Schonning 8f638799ec Regen rubocop-todo without Max shadowing (#24076) 2023-03-16 12:31:08 +09:00
dependabot[bot] 5118729c68 Bump sass from 1.58.3 to 1.59.3 (#24105) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-16 11:11:54 +09:00
dependabot[bot] f21a887d8a Bump autoprefixer from 10.4.13 to 10.4.14 (#24108) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-16 10:56:03 +09:00
Eugen Rochko 8819143d8b Add cache headers to static files served through Rails (#24120) 2023-03-16 02:55:54 +01:00
dependabot[bot] a65b766b22 Bump @babel/core from 7.21.0 to 7.21.3 (#24111) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-16 10:55:29 +09:00
Eugen Rochko 5c07fc3260 Add `SENDFILE_HEADER` environment variable (#24123) 2023-03-16 02:55:13 +01:00
Eugen Rochko 4ea5355857 Remove `bullet` and `active_record_query_trace` gems (#24121) 2023-03-16 02:53:55 +01:00
dependabot[bot] 1657997334 Bump eslint from 8.35.0 to 8.36.0 (#24089) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-16 10:44:56 +09:00
dependabot[bot] 1cab093a65 Bump @babel/eslint-parser from 7.19.1 to 7.21.3 (#24109) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-16 10:44:21 +09:00
dependabot[bot] 847bb3bcae Bump immutable from 4.2.4 to 4.3.0 (#24088) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-16 10:42:27 +09:00
Nick Schonning 0717d1b058 Autofix Rubocop Style/RedundantArgument (#23798) 2023-03-16 10:34:00 +09:00
dependabot[bot] 69c0672fc4 Bump rack-test from 2.0.2 to 2.1.0 (#24112) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-16 10:33:26 +09:00
Nick Schonning 6d0a49f4a4 Autofix Rubocop Style/PreferredHashMethods (#23851) 2023-03-16 01:36:37 +01:00
Nick Schonning 994cb73f56 Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
Nick Schonning a3037c8e71 Skip pushing containers on forks (#24106) 2023-03-15 16:43:44 +01:00
Renaud Chaput 0137e46963 Use Github Container Registry as the official container image source (#24113) 2023-03-15 16:41:13 +01:00
Rodion Borisov 20af3cc038 [Glitch] Center the text itself in upload area 
Port 100ada1e2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-15 09:33:48 +01:00
PauloVilarinho 08685405f1 [Glitch] add modal message when editing toot 
Port c4c1c8aecc to glitch-soc

Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-15 09:33:14 +01:00
Claire f39d9ab256 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.
 2023-03-15 09:16:10 +01:00
Claire f3fbaf7256 Merge pull request #2122 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-03-15 08:58:12 +01:00
Nick Schonning 30328759da Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
Claire 8a618c8eca Fix misleading error code when receiving invalid WebAuthn credentials (#23568) 2023-03-15 04:15:20 +01:00
Claire 5f11a64dbc Fix incorrect post links in strikes when the account is remote (#23611) 2023-03-15 04:14:47 +01:00
Claire bde1c7aa96 Fix dashboard crash on ElasticSearch server error (#23751) 2023-03-15 04:01:49 +01:00
Nick Schonning 45b58d43d4 Update PostCSS dependencies (#23835) 2023-03-15 04:01:10 +01:00
Matt Jankowski a7bc6ae1de Add spec for the CLI `version` task (#23978) 2023-03-15 03:56:09 +01:00
CSDUMMI cfc04637b5 Redirect users to SLO at the IdP after logging them out of Mastodon. (#24020) 2023-03-15 03:52:40 +01:00
Claire 23bce96f0c Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +01:00
Nick Schonning 4c36099942 Skip Docker CI Login/Push on forks (#23564) 2023-03-15 03:43:49 +01:00
Renaud Chaput 1a3efd6453 Push Docker images to Github Container Registry as well (#24101) 2023-03-14 20:27:43 +01:00
dependabot[bot] 75135dc71b 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>
 2023-03-14 14:55:42 +01:00
dependabot[bot] 9e1c1b628b 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>
 2023-03-14 14:50:19 +01:00
dependabot[bot] 12ebd16c5d 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>
 2023-03-14 14:50:08 +01:00
CSDUMMI ee757aadb6 Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064) 2023-03-14 14:47:57 +01:00
dependabot[bot] 2ab9cd15b1 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>
 2023-03-13 11:32:15 +01:00
dependabot[bot] 39d483b285 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>
 2023-03-13 11:16:24 +01:00
CSDUMMI 5f9f43d051 Prefer the stored location as after_sign_in_path in Omniauth Callback Controller (#24073) 2023-03-13 00:06:27 +01:00
Nick Schonning 12cbdf36a9 Enable Rubocop Performance/DeleteSuffix (#24077) 2023-03-13 00:03:07 +01:00
Claire 852eb6ce7a Fix sidekiq jobs not triggering Elasticsearch index updates (#24046) 2023-03-12 23:47:55 +01:00
Matt Jankowski 00f9e14d13 Add basic search specs for chewy indexes (#24065) 2023-03-10 19:31:10 +01:00
Nick Schonning 7f17a44a6b Enable RSpec/FilePath (#23965) 2023-03-10 16:32:37 +01:00