about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2023-03-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.
2023-03-22Fix Rails cache namespace being overriden with `v2` for cached statuses (#24202)Claire
2023-03-22Remove unused InstancePresenter methods (#24206)Matt Jankowski
2023-03-21Refactoring relations_map (#24195)Takeshi Umeda
2023-03-20Fit the max-width of media in .prose to parent box (#24180)mogamin
2023-03-20Remove references to non-existent actions (#24183)Matt Jankowski
2023-03-19Add getting-started-misc to route (#2141)Plastikmensch
* Add getting-started-misc to web_app_paths Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add signed in check to navigation entries Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors. Also fixed the keys as these were literally "i++". Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Remove "Extended information" from getting-started-misc I couldn't find any reference to this translation string, so I removed it too. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19Webhooks for local status.create, status.update, account.update (#24133)Vyr Cossont
2023-03-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-03-17Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (#24142)Jean byroot Boussier
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17Include config/ and update all rubcop deps (#23963)Nick Schonning
2023-03-17Link to the Identity provider's account settings from the account settings ↵CSDUMMI
(#24100) Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-16[Glitch] Replace `Status#translatable?` with language matrix in separate ↵Christian Schmidt
endpoint Port bd047acc356671727c112336bb237f979bba517d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-16Add warning for object storage misconfiguration (#24137)Claire
2023-03-16Change user backups to use expiring URLs for download when possible (#24136)Eugen Rochko
2023-03-16New Crowdin updates (#23904)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16Replace `Status#translatable?` with language matrix in separate endpoint ↵Christian Schmidt
(#24037)
2023-03-16Refactor monkey-patching of `PrivateAddressCheck` (#24122)Eugen Rochko
2023-03-16Autofix Rubocop Style/RedundantArgument (#23798)Nick Schonning
2023-03-15Fix more haml-lint Rubocop (#24107)Nick Schonning
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-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-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-13Prefer the stored location as after_sign_in_path in Omniauth Callback ↵CSDUMMI
Controller (#24073)
2023-03-09Center the text itself in upload area (#24029)Rodion Borisov
2023-03-08Unescape HTML entities (#24019)Christian Schmidt
2023-03-06Remove unused TOCGenerator (#23986)Matt Jankowski
2023-03-06add modal message when editing toot (#23936)PauloVilarinho
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06Remove sidebar dead code (#23984)Claire
2023-03-06Fix unconfirmed accounts being registered as active users (#23803)Claire
2023-03-06Do not strip tags from `Setting.site_short_description` (#23975)Christian Schmidt
2023-03-05Refactor glitch-soc rich text SCSSClaire
2023-03-05[Glitch] Only offer translation for supported languagesChristian Schmidt
Port 5a8c651e8f0252c7135042e79396f782361302d9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05[Glitch] Switched bookmark and favourites aroundTerry Garcia
Port a1347f456e47e085ef1031b607cabd0683c496c2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05[Glitch] Fix duplicate “Publish” button on mobileClaire
Port b55fc883b6181fb8080fbafd53bc7a9f1896b295 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.
2023-03-05New Crowdin updates (#2118)Claire
* New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip]
2023-03-05[Glitch] Add `lang` attribute to media and poll optionsChristian Schmidt
Port d3eefead3014175b264cb56f6f4cb552cbaaeac6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05Enable Rubocop for app/views (#23874)Nick Schonning
2023-03-04Do not leave Mastodon when clicking “Back” (#23953)Christian Schmidt
2023-03-04User mailer spec coverage improvements (#23905)Matt Jankowski
2023-03-04Misc coverage improvements for validators (#23928)Matt Jankowski
2023-03-04Upgrade to latest redis-rb 4.x and fix deprecations (#23616)Jean byroot Boussier
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
generated by cgit-pink (git 2.37.1) at 2024-07-01 16:49:28 +0000