Fix community_view clippy

diff --git a/ansible/VERSION b/ansible/VERSION
index 4d067892d6ffa168eca12f9a27a4a268271f7b8d..f8cb2549599c480fe688bc30a7b8a236be8853d4 100644 (file)
--- a/ansible/VERSION
+++ b/ansible/VERSION
@@ -1 +1 @@
-v0.7.50
+v0.7.51

diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index fb8b09a327dc48afd5e4b0826d9f896b593443e2..2e9a219d07a460aef1693905645a828366af3ba1 100644 (file)
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.7.50
+    image: dessalines/lemmy:v0.7.51
     ports:
       - "127.0.0.1:8536:8536"
     restart: always

diff --git a/docker/travis/docker_push.sh b/docker/travis/docker_push.sh
index 14ebccb09c1a67e2d56be27cb8b803f1762a02cd..54b0a43bfb64ba411f1183e4523d001ebb648ae7 100644 (file)
--- 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.7.50
-docker push dessalines/lemmy:v0.7.50
+  dessalines/lemmy:v0.7.51
+docker push dessalines/lemmy:v0.7.51

diff --git a/server/lemmy_db/src/community_view.rs b/server/lemmy_db/src/community_view.rs
index 7445cc4630cc39e0fdcf5a63e8843a636c821487..1d47c7d7ed398560de2a60b854952dd5a7767ac0 100644 (file)
--- a/server/lemmy_db/src/community_view.rs
+++ b/server/lemmy_db/src/community_view.rs
@@ -245,7 +245,8 @@ impl<'a> CommunityQueryBuilder<'a> {
             .filter(user_id.is_null())
         }
       },
-      SortType::Hot | _ => {
+      // Covers all other sorts, including hot
+      _ => {
         query = query
           .order_by(hot_rank.desc())
           .then_order_by(number_of_subscribers.desc())

diff --git a/server/src/version.rs b/server/src/version.rs
index 68b46483d262ece0172d6bf9fcccc0801a94beaa..d76db5248c38d68049b3a9af5adeee37e6e01592 100644 (file)
--- a/server/src/version.rs
+++ b/server/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "v0.7.50";
+pub const VERSION: &str = "v0.7.51";

diff --git a/ui/package.json b/ui/package.json
index 4ba3c78b1c8509ce6cb59df17cef334a65f7eaa1..06c52807a7281ef015381846e696d39f66006ac8 100644 (file)
--- a/ui/package.json
+++ b/ui/package.json
@@ -73,7 +73,7 @@
   "engineStrict": true,
   "husky": {
     "hooks": {
-      "pre-commit": "cargo clippy --manifest-path ../server/Cargo.toml --all-targets --workspace -- -D warnings && lint-staged"
+      "pre-commit": "cargo +nightly clippy --manifest-path ../server/Cargo.toml --all-targets --workspace -- -D warnings && lint-staged"
     }
   },
   "lint-staged": {