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
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>
2023-03-10 15:24:19 +01:00
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>
2023-03-10 14:08:10 +01:00
688287c59d
Coverage improvement round-out following up previous work ( #23987 )
2023-03-10 13:33:30 +01:00
56bddfbfa3
Serializers spec coverage ( #24017 )
2023-03-10 12:12:51 +01:00
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>
2023-03-10 11:12:06 +01:00
4fa542f3c4
Sync CI and Docker Compose image versions ( #24053 )
2023-03-10 11:10:47 +01:00
a52ccd7ad9
Center the text itself in upload area ( #24029 )
2023-03-09 14:35:44 +01:00
2f7a663b0b
Explicitly set github repo in instance presenter spec ( #24036 )
2023-03-09 14:27:48 +01:00
684a970b3c
Unescape HTML entities ( #24019 )
2023-03-08 19:56:41 +01:00
9dfe2dbd3f
Skip rebase-needed job for i10n branch ( #24026 )
2023-03-08 19:26:25 +01:00
b715bd8e53
Add refreshing many accounts at once with "tootctl accounts refresh" ( #23304 )
2023-03-08 17:06:53 +01:00
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>
2023-03-08 16:25:16 +01:00
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>
2023-03-08 12:54:12 +01:00
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>
2023-03-08 12:53:48 +01:00
a47358e27c
Bump jest-environment-jsdom from 29.4.3 to 29.5.0 ( #23998 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 12:14:18 +01:00
71cd77536d
Bump jest from 29.4.3 to 29.5.0 ( #24003 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 12:00:05 +01:00
5da3fd170e
Bump doorkeeper from 5.6.4 to 5.6.5 ( #24009 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:45:09 +01:00
c9860d36d4
Bump omniauth_openid_connect from 0.6.0 to 0.6.1 ( #23991 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:44:23 +01:00
3d46823e9f
Bump utf-8-validate from 6.0.2 to 6.0.3 ( #23992 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:32:44 +01:00
ff1913d58f
Bump axios from 1.3.3 to 1.3.4 ( #23996 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:32:21 +01:00
aabf2bf8d6
Bump rack from 2.2.6.2 to 2.2.6.3 ( #23997 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:32:09 +01:00
49a4a7fa83
Bump sidekiq-scheduler from 5.0.1 to 5.0.2 ( #24004 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:31:46 +01:00
Nick Schonning