diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca01f5b38..c0cfe7e0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -339,6 +339,10 @@ release-create: stage: deploy image: registry.gitlab.com/gitlab-org/release-cli:latest rules: *tag-rules + variables: + APP_ASSET_AMD64: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_amd64.tar.gz" + APP_ASSET_ARM: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_arm.tar.gz" + APP_ASSET_ARM64: "${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_arm64.tar.gz" before_script: - apk --no-cache add gawk sed grep script: | @@ -348,4 +352,6 @@ release-create: release-cli create --name "$CI_COMMIT_TAG" \ --description "$CHANGELOG" \ --tag-name "$CI_COMMIT_TAG" \ - --assets-link "{\"name\":\"${APP_ASSET}\",\"url\":\"${ENDPOINT}/${APP_ASSET}\"}" + --assets-link "{\"name\":\"${APP_ASSET_AMD64}\",\"url\":\"${ENDPOINT}/${APP_ASSET_AMD64}\"}" \ + --assets-link "{\"name\":\"${APP_ASSET_ARM}\",\"url\":\"${ENDPOINT}/${APP_ASSET_ARM}\"}" \ + --assets-link "{\"name\":\"${APP_ASSET_ARM64}\",\"url\":\"${ENDPOINT}/${APP_ASSET_ARM64}\"}" diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 8d84def25..d597638a3 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3.2" services: postgres: diff --git a/js/src/components/Activity/GroupActivityItem.vue b/js/src/components/Activity/GroupActivityItem.vue index ba8d0d19c..8a58660b6 100644 --- a/js/src/components/Activity/GroupActivityItem.vue +++ b/js/src/components/Activity/GroupActivityItem.vue @@ -148,6 +148,11 @@ export default class GroupActivityItem extends mixins(ActivityMixin) { case Openness.INVITE_ONLY: details.push("The group can now only be joined with an invite."); break; + case Openness.MODERATED: + details.push( + "The group can now be joined by anyone, but new members need to be approved by an administrator." + ); + break; case Openness.OPEN: details.push("The group can now be joined by anyone."); break; diff --git a/js/src/components/Activity/MemberActivityItem.vue b/js/src/components/Activity/MemberActivityItem.vue index 3434c4dfc..d927438b6 100644 --- a/js/src/components/Activity/MemberActivityItem.vue +++ b/js/src/components/Activity/MemberActivityItem.vue @@ -9,13 +9,7 @@ :inline="true" slot="member" > - - {{ - $t("@{username}", { - username: usernameWithDomain(activity.object.actor), - }) - }} {{ displayName(activity.object.actor) }} {{ subjectParams.member_actor_federated_username @@ -25,13 +19,7 @@ :inline="true" slot="profile" > - - {{ - $t("@{username}", { - username: usernameWithDomain(activity.author), - }) - }} {{ displayName(activity.author) }} {{ @@ -41,7 +29,7 @@