ed5d57dac3
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. |
||
---|---|---|
.. | ||
active_record | ||
assets | ||
chewy | ||
devise | ||
generators/post_deployment_migration | ||
json_ld | ||
linter | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
simple_navigation | ||
tasks | ||
templates/haml/scaffold | ||
terrapin | ||
webpacker | ||
exceptions.rb | ||
http_extensions.rb | ||
public_file_server_middleware.rb |