mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 12:24:31 +00:00
3c7dbf3a16
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. |
||
|---|---|---|
| .. | ||
| cli | ||
| migration_helpers.rb | ||
| migration_warning.rb | ||
| premailer_webpack_strategy.rb | ||
| rack_middleware.rb | ||
| redis_config.rb | ||
| sidekiq_middleware.rb | ||
| snowflake.rb | ||
| version.rb | ||