193250556c
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
f5daa20f2a
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-16 23:09:53 +01:00
681dcd3fa3
Ignore additional Style/OptionalBooleanParameter ( #24138 )
2023-03-16 23:07:25 +01:00
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
edc7ca5920
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
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
bd047acc35
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
630436ab2d
Refactor monkey-patching of `PrivateAddressCheck` ( #24122 )
2023-03-16 04:33:38 +01:00
aa947a143b
Regen rubocop-todo without Max shadowing ( #24076 )
2023-03-16 12:31:08 +09:00
f57bcb028b
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
aa7d63d9aa
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
f0e727f958
Add cache headers to static files served through Rails ( #24120 )
2023-03-16 02:55:54 +01:00
be488adf71
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
8cb2543ee5
Add `SENDFILE_HEADER` environment variable ( #24123 )
2023-03-16 02:55:13 +01:00
6fa81ca17e
Remove `bullet` and `active_record_query_trace` gems ( #24121 )
2023-03-16 02:53:55 +01:00
dbbd462c10
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
b9618c82e3
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
b1b8a27b42
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
25d36b6edd
Autofix Rubocop Style/RedundantArgument ( #23798 )
2023-03-16 10:34:00 +09:00
0566c81a0c
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
a38f67c1c3
Autofix Rubocop Style/PreferredHashMethods ( #23851 )
2023-03-16 01:36:37 +01:00
65669d3c57
Fix more haml-lint Rubocop ( #24107 )
2023-03-15 20:07:43 +01:00
0b8b0ef652
Skip pushing containers on forks ( #24106 )
2023-03-15 16:43:44 +01:00
f9bdaebad2
Use Github Container Registry as the official container image source ( #24113 )
2023-03-15 16:41:13 +01:00
32418f0ff3
[Glitch] Center the text itself in upload area
...
Port a52ccd7ad9
2023-03-15 09:33:48 +01:00
17fb58bff3
[Glitch] add modal message when editing toot
...
Port 8770473dbb
2023-03-15 09:33:14 +01:00
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.
2023-03-15 09:16:10 +01:00
6a0ed45aa3
Merge pull request #2122 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-15 08:58:12 +01:00
75131e7bf7
Setup haml-lint CI with todo config ( #23524 )
2023-03-15 04:15:36 +01:00
a232a1feb8
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2023-03-15 04:15:20 +01:00
cf50667e26
Fix incorrect post links in strikes when the account is remote ( #23611 )
2023-03-15 04:14:47 +01:00
9875be09fe
Fix dashboard crash on ElasticSearch server error ( #23751 )
2023-03-15 04:01:49 +01:00
15fdd94e2f
Update PostCSS dependencies ( #23835 )
2023-03-15 04:01:10 +01:00
a471e1c48f
Add spec for the CLI `version` task ( #23978 )
2023-03-15 03:56:09 +01:00
39c7236649
Redirect users to SLO at the IdP after logging them out of Mastodon. ( #24020 )
2023-03-15 03:52:40 +01:00
1d0ad558ff
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
ed887271f3
Skip Docker CI Login/Push on forks ( #23564 )
2023-03-15 03:43:49 +01:00
50d39c275d
Push Docker images to Github Container Registry as well ( #24101 )
2023-03-14 20:27:43 +01:00
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>
2023-03-14 14:55:42 +01:00
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>
2023-03-14 14:50:19 +01:00
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>
2023-03-14 14:50:08 +01:00
5dee40b5f5
Support the PROXY protocol through the PROXY_PROTO_V1 env variable ( #24064 )
2023-03-14 14:47:57 +01:00
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>
2023-03-13 11:32:15 +01:00
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>
2023-03-13 11:16:24 +01:00
d258ec8e3b
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller ( #24073 )
2023-03-13 00:06:27 +01:00
e762a14c0a
Enable Rubocop Performance/DeleteSuffix ( #24077 )
2023-03-13 00:03:07 +01:00
f432db7b9f
Fix sidekiq jobs not triggering Elasticsearch index updates ( #24046 )
2023-03-12 23:47:55 +01:00
1ed12d5e2f
Add basic search specs for chewy indexes ( #24065 )
2023-03-10 19:31:10 +01:00
3ea0856f70
Enable RSpec/FilePath ( #23965 )
2023-03-10 16:32:37 +01:00
Claire