about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2023-03-16Refactor monkey-patching of `PrivateAddressCheck` (#24122)Eugen Rochko
2023-03-16Regen rubocop-todo without Max shadowing (#24076)Nick Schonning
2023-03-16Bump sass from 1.58.3 to 1.59.3 (#24105)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Bump autoprefixer from 10.4.13 to 10.4.14 (#24108)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Add cache headers to static files served through Rails (#24120)Eugen Rochko
2023-03-16Bump @babel/core from 7.21.0 to 7.21.3 (#24111)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Add `SENDFILE_HEADER` environment variable (#24123)Eugen Rochko
2023-03-16Remove `bullet` and `active_record_query_trace` gems (#24121)Eugen Rochko
2023-03-16Bump eslint from 8.35.0 to 8.36.0 (#24089)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Bump @babel/eslint-parser from 7.19.1 to 7.21.3 (#24109)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Bump immutable from 4.2.4 to 4.3.0 (#24088)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Autofix Rubocop Style/RedundantArgument (#23798)Nick Schonning
2023-03-16Bump rack-test from 2.0.2 to 2.1.0 (#24112)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Autofix Rubocop Style/PreferredHashMethods (#23851)Nick Schonning
2023-03-15Fix more haml-lint Rubocop (#24107)Nick Schonning
2023-03-15Skip pushing containers on forks (#24106)Nick Schonning
2023-03-15Use Github Container Registry as the official container image source (#24113)Renaud Chaput
2023-03-15[Glitch] Center the text itself in upload areaRodion Borisov
Port a52ccd7ad98d7d60dffb520c0397ba8aa4c2eb9d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-15[Glitch] add modal message when editing tootPauloVilarinho
Port 8770473dbb92042f76e058469a76e5bb4beecb9f to glitch-soc Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-15Merge pull request #2122 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-03-15Setup haml-lint CI with todo config (#23524)Nick Schonning
2023-03-15Fix misleading error code when receiving invalid WebAuthn credentials (#23568)Claire
2023-03-15Fix incorrect post links in strikes when the account is remote (#23611)Claire
2023-03-15Fix dashboard crash on ElasticSearch server error (#23751)Claire
2023-03-15Update PostCSS dependencies (#23835)Nick Schonning
2023-03-15Add spec for the CLI `version` task (#23978)Matt Jankowski
2023-03-15Redirect users to SLO at the IdP after logging them out of Mastodon. (#24020)CSDUMMI
2023-03-15Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ↵Claire
(#24034)
2023-03-15Skip Docker CI Login/Push on forks (#23564)Nick Schonning
2023-03-14Push Docker images to Github Container Registry as well (#24101)Renaud Chaput
2023-03-14Bump rubocop from 1.48.0 to 1.48.1 (#24095)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-14Bump rails from 6.1.7.2 to 6.1.7.3 (#24096)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-14Bump rack from 2.2.6.3 to 2.2.6.4 (#24097)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-14 Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064)CSDUMMI
2023-03-13Bump pghero from 3.2.0 to 3.3.0 (#24085)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-13Bump jsdom from 21.1.0 to 21.1.1 (#24090)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-13Prefer the stored location as after_sign_in_path in Omniauth Callback ↵CSDUMMI
Controller (#24073)
2023-03-13Enable Rubocop Performance/DeleteSuffix (#24077)Nick Schonning
2023-03-12Fix sidekiq jobs not triggering Elasticsearch index updates (#24046)Claire
2023-03-10Add basic search specs for chewy indexes (#24065)Matt Jankowski
2023-03-10Enable RSpec/FilePath (#23965)Nick Schonning
2023-03-10Bump eslint from 8.33.0 to 8.35.0 (#24049)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-10Bump pghero from 3.1.0 to 3.2.0 (#24044)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-10Coverage improvement round-out following up previous work (#23987)Matt Jankowski
2023-03-10Serializers spec coverage (#24017)Matt Jankowski
2023-03-10Bump puma from 6.1.0 to 6.1.1 (#24045)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-10Sync CI and Docker Compose image versions (#24053)Nick Schonning
2023-03-09Center the text itself in upload area (#24029)Rodion Borisov
2023-03-09Explicitly set github repo in instance presenter spec (#24036)Matt Jankowski