Claire 3c7dbf3a16 Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed the environment variables used for defining the version number. This change occurs close to lines that were modified in glitch-soc to account for the different repositories to push to. Ported upstream changes. - `.github/workflows/build-push-pr.yml`: Upstream changed the environment variables used for defining the version number. This change occurs close to lines that were modified in glitch-soc to account for the different repositories to push to. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream changed how the version string is built from environment variables. Adapted the logic to account for the `+glitch` in glitch-soc.		2023-09-02 11:56:09 +02:00
..
cli	Add new public status index (#26344)	2023-08-24 16:40:04 +02:00
migration_helpers.rb	Fix adding column with default value taking longer on Postgres >= 11 (#26375)	2023-08-08 09:09:58 +02:00
migration_warning.rb	Migration warning helper, and only run in production env (#24253)	2023-03-26 00:39:24 +01:00
premailer_webpack_strategy.rb	Fix Style/SlicingWithRange cop (#25923)	2023-07-12 10:03:06 +02:00
rack_middleware.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	2022-04-29 22:43:07 +02:00
redis_config.rb	Update redis_config.rb to remove warning message (#24352)	2023-04-02 06:49:37 +02:00
sidekiq_middleware.rb	Fix sidekiq jobs not triggering Elasticsearch index updates (#24046)	2023-03-12 23:47:55 +01:00
snowflake.rb	Refactor Snowflake to avoid brakeman sql injection warnings (#25879)	2023-07-12 10:44:58 +02:00
version.rb	Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream	2023-09-02 11:56:09 +02:00