From df913326bd40b8a1a79261e4efc795357d11bab3 Mon Sep 17 00:00:00 2001 From: Tafiti Date: Tue, 1 Dec 2020 18:18:47 -0500 Subject: [PATCH 1/4] typo --- docs/src/lemmy_council.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/lemmy_council.md b/docs/src/lemmy_council.md index 45a8fa1bf..e68eafa03 100644 --- a/docs/src/lemmy_council.md +++ b/docs/src/lemmy_council.md @@ -28,7 +28,7 @@ Every week, the council should make a thread on Lemmy that details its activity At the same time, users can give feedback and suggestions in this thread. This should be taken into account by the council. Council members can call for a vote on any controversial issues, if they can't be resolved by discussion. -## 2. Voting Process +## 3. Voting Process Most of the time, we keep each other up to date through the Matrix chat, and take informal decisions on uncontroversial issues. For example, a user clearly violating the site rules could be banned by a single person, or ideally after discussing it with at least one other member. From d06b59c92b7ef1258929c0babea4591e55cef285 Mon Sep 17 00:00:00 2001 From: Tafiti Date: Tue, 1 Dec 2020 18:22:17 -0500 Subject: [PATCH 2/4] Added a council member. --- docs/src/lemmy_council.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/lemmy_council.md b/docs/src/lemmy_council.md index e68eafa03..7bcb30892 100644 --- a/docs/src/lemmy_council.md +++ b/docs/src/lemmy_council.md @@ -76,3 +76,4 @@ General Contact [@LemmyDev Mastodon](https://mastodon.social/@LemmyDev) - [AgreeableLandscape](https://lemmy.ml/u/AgreeableLandscape) - [fruechtchen](https://lemmy.ml/u/fruechtchen) - [kixiQu](https://lemmy.ml/u/kixiQu) +- [Karanja](https://baraza.africa/u/mwalimu) From 8a0336c2ff74ea32ca52b775009699494642d42d Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 2 Dec 2020 16:04:13 -0500 Subject: [PATCH 3/4] Fixing community local filter. #1302 --- lemmy_db/src/post_view.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemmy_db/src/post_view.rs b/lemmy_db/src/post_view.rs index 3fb6d2b06..ea03c3a4d 100644 --- a/lemmy_db/src/post_view.rs +++ b/lemmy_db/src/post_view.rs @@ -280,7 +280,7 @@ impl<'a> PostQueryBuilder<'a> { if let Some(for_community_name) = self.for_community_name { query = query .filter(community_name.eq(for_community_name)) - .filter(local.eq(true)) + .filter(community_local.eq(true)) .then_order_by(stickied.desc()); } From eed7eac10b2c8b0e8b884180851410e131f6694e Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 3 Dec 2020 08:28:58 -0600 Subject: [PATCH 4/4] Version v0.8.10 --- ansible/VERSION | 2 +- docker/dev/docker-compose.yml | 2 +- docker/federation/docker-compose.yml | 10 +++++----- docker/prod/docker-compose.yml | 4 ++-- docker/travis/docker_push.sh | 4 ++-- lemmy_api/src/version.rs | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 6209aab6b..2430a5737 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.8.9 +v0.8.10 diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 6bb097b81..a09fb8eb1 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -16,7 +16,7 @@ services: - postgres - iframely lemmy-ui: - image: dessalines/lemmy-ui:v0.8.9 + image: dessalines/lemmy-ui:v0.8.10 ports: - "1235:1234" restart: always diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index a24c94dc5..e32dfe2da 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -29,7 +29,7 @@ services: - ./volumes/pictrs_alpha:/mnt lemmy-alpha-ui: - image: dessalines/lemmy-ui:v0.8.9 + image: dessalines/lemmy-ui:v0.8.10 environment: - LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_EXTERNAL_HOST=localhost:8541 @@ -68,7 +68,7 @@ services: - ./volumes/postgres_alpha:/var/lib/postgresql/data lemmy-beta-ui: - image: dessalines/lemmy-ui:v0.8.9 + image: dessalines/lemmy-ui:v0.8.10 environment: - LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_EXTERNAL_HOST=localhost:8551 @@ -107,7 +107,7 @@ services: - ./volumes/postgres_beta:/var/lib/postgresql/data lemmy-gamma-ui: - image: dessalines/lemmy-ui:v0.8.9 + image: dessalines/lemmy-ui:v0.8.10 environment: - LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_EXTERNAL_HOST=localhost:8561 @@ -147,7 +147,7 @@ services: # An instance with only an allowlist for beta lemmy-delta-ui: - image: dessalines/lemmy-ui:v0.8.9 + image: dessalines/lemmy-ui:v0.8.10 environment: - LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_EXTERNAL_HOST=localhost:8571 @@ -187,7 +187,7 @@ services: # An instance who has a blocklist, with lemmy-alpha blocked lemmy-epsilon-ui: - image: dessalines/lemmy-ui:v0.8.9 + image: dessalines/lemmy-ui:v0.8.10 environment: - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_EXTERNAL_HOST=localhost:8581 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 12ee03efb..c3d61a64c 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.8.9 + image: dessalines/lemmy:v0.8.10 ports: - "127.0.0.1:8536:8536" restart: always @@ -26,7 +26,7 @@ services: - iframely lemmy-ui: - image: dessalines/lemmy-ui:v0.8.9 + image: dessalines/lemmy-ui:v0.8.10 ports: - "1235:1234" restart: always diff --git a/docker/travis/docker_push.sh b/docker/travis/docker_push.sh index 1bc749ece..ba77f0264 100644 --- a/docker/travis/docker_push.sh +++ b/docker/travis/docker_push.sh @@ -1,5 +1,5 @@ #!/bin/sh echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker tag dessalines/lemmy:travis \ - dessalines/lemmy:v0.8.9 -docker push dessalines/lemmy:v0.8.9 + dessalines/lemmy:v0.8.10 +docker push dessalines/lemmy:v0.8.10 diff --git a/lemmy_api/src/version.rs b/lemmy_api/src/version.rs index b415c7f6f..e44da9fb9 100644 --- a/lemmy_api/src/version.rs +++ b/lemmy_api/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.8.9"; +pub const VERSION: &str = "v0.8.10";