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.

This commit is contained in:

Claire

2023-09-02 11:56:09 +02:00

parent 023673c0d9 5694e24bbf

commit 3c7dbf3a16

9 changed files with 35 additions and 21 deletions

									
										app/workers/add_to_public_statuses_index_worker.rb
									
		+2
		
												View File
												
				@@ -3,6 +3,8 @@

				class AddToPublicStatusesIndexWorker

				  include Sidekiq::Worker

				  sidekiq_options queue: 'pull'

				  def perform(account_id)

				    account = Account.find(account_id)