mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 14:13:42 +01: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. |
||
|---|---|---|
| .. | ||
| account_associations.rb | ||
| account_avatar.rb | ||
| account_counters.rb | ||
| account_finder_concern.rb | ||
| account_header.rb | ||
| account_interactions.rb | ||
| account_merging.rb | ||
| account_search.rb | ||
| account_statuses_search.rb | ||
| attachmentable.rb | ||
| cacheable.rb | ||
| domain_materializable.rb | ||
| domain_normalizable.rb | ||
| expireable.rb | ||
| follow_limitable.rb | ||
| has_user_settings.rb | ||
| ldap_authenticable.rb | ||
| lockable.rb | ||
| omniauthable.rb | ||
| paginable.rb | ||
| pam_authenticable.rb | ||
| rate_limitable.rb | ||
| redisable.rb | ||
| relationship_cacheable.rb | ||
| remotable.rb | ||
| status_safe_reblog_insert.rb | ||
| status_search_concern.rb | ||
| status_snapshot_concern.rb | ||
| status_threading_concern.rb | ||