191 Commits (main)

Author	SHA1	Message	Date
Claire	666760f450	Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream fixed a command we have modified in glitch-soc. Updated as upstream did.	4 days ago
Nick Schonning	13fb54920b	Enable Style/IfUnlessModifier RuboCop (#30260)	6 days ago
Claire	3789d9f825	Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream ... Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests.	2 weeks ago
Matt Jankowski	1e7d5d2957	Update `devise-two-factor` to version 5.0.0 (#28325) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 weeks ago
Claire	eeefb7cdbc	Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream	2 weeks ago
Matt Jankowski	369b2ef0ed	Fix `Style/TrailingCommaInHashLiteral` cop (#30004)	4 weeks ago
Matt Jankowski	933189887b	Fix `Style/StringLiterals` cop (#30005)	4 weeks ago
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	4 months ago
Matt Jankowski	c8f59d2ca4	Fix `Style/TernaryParentheses` cop (#28387)	4 months ago
Claire	077e0c6812	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.	5 months ago
Claire	46ddaffd40	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	5 months ago
Matt Jankowski	42afd30324	Replace Sprockets with Propshaft (#28239)	5 months ago
Matt Jankowski	33cc3ae8fa	Fix `Style/StabbyLambdaParentheses` cop (#27771)	6 months ago
Claire	62620956d5	Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream	7 months ago
Matt Jankowski	9a3d047f3e	Run `bin/rails app:update` with Rails 7.1 (#27522)	7 months ago
Claire	ac2370778a	Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes.	7 months ago
Nick Schonning	85db392464	Autofix Rubocop cops for config/ (#24145)	8 months ago
Claire	77caba3789	Merge branch 'main' into glitch-soc/merge-upstream	9 months ago
Claire	cab4cbfa5c	Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793)	9 months ago
Claire	afc3b12217	Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README, we have a completely different one. Kept ours. - `config/initializers/content_security_policy.rb`: Upstream has updated their development CSPs, while we disable CSPs in the development environment. Kept our version.	9 months ago
Christian Schmidt	075cc8e8a6	Improve Codespaces port forwarding (#26400)	9 months ago
Claire	2d09653d50	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.	10 months ago
Matt Jankowski	ce43ed144c	Rails 7.0 update (#25668)	10 months ago
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	10 months ago
Nick Schonning	1d557305d2	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	10 months ago
Eugen Rochko	ba06a2f104	Revert "Rails 7 update" (#25667)	11 months ago
Matt Jankowski	50c2a03695	Rails 7 update (#24241)	11 months ago
Claire	d77fbbed73	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.	1 year ago
Claire	2d029dedd9	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.	1 year ago
Nick Schonning	1fe04f740a	Enable Rubocop Rails/FilePath (#23854)	1 year ago
mogaminsk	e0d075713f	Change i18n-fallbacks to English (#24727)	1 year ago
Claire	5ac380c122	Merge branch 'main' into glitch-soc/merge-upstream ... 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.	1 year ago
Eugen Rochko	0ca54a4105	Remove `Permissions-Policy` header from all responses (#24124)	1 year ago
Claire	3091a184ca	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Jean byroot Boussier	160f38f03d	Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (#24142) ... Co-authored-by: Jean Boussier <jean.boussier@gmail.com>	1 year ago
Claire	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.	1 year ago
Eugen Rochko	630436ab2d	Refactor monkey-patching of `PrivateAddressCheck` (#24122)	1 year ago
Eugen Rochko	f0e727f958	Add cache headers to static files served through Rails (#24120)	1 year ago
Eugen Rochko	8cb2543ee5	Add `SENDFILE_HEADER` environment variable (#24123)	1 year ago
Eugen Rochko	6fa81ca17e	Remove `bullet` and `active_record_query_trace` gems (#24121)	1 year ago
Claire	7623e18124	Merge branch 'main' into glitch-soc/merge-upstream ... 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.	1 year ago
Jean byroot Boussier	922837dc96	Upgrade to latest redis-rb 4.x and fix deprecations (#23616) ... Co-authored-by: Jean Boussier <jean.boussier@gmail.com>	1 year ago
Claire	02c6bad3ca	Change unintended SMTP read timeout from 5 seconds to 20 seconds (#23750)	1 year ago
Claire	a7bf439cfd	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	cff7d967f9	Fix CSRF protection (#23037) ... Fix regression from #23014	1 year ago
Claire	9765d2b3f8	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream changed headers, and we have different ones. Ported upstream's change.	1 year ago
Claire	aefefc74c4	Change referrer-policy to no-referrer application-wide (#23014)	1 year ago
Claire	aec61a703f	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.	2 years ago
Rose	4f15fd0ba1	Fix style for hashes (#20518) ... * Fix style for hashes Make the style for hashes consistent. * New style More consistency	2 years ago
Claire	93912f0498	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.	2 years ago