gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix community_view clippy

pull/1093/head
Dessalines 2020-08-16 11:27:50 -04:00
parent 0a27432b65
commit abadc79756
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/VERSION vendored
View File

@ -1 +1 @@
v0.7.50 v0.7.51

2
docker/prod/docker-compose.yml vendored
View File

@ -12,7 +12,7 @@ services:
restart: always restart: always
lemmy: lemmy:
image: dessalines/lemmy:v0.7.50 image: dessalines/lemmy:v0.7.51
ports: ports:
- "127.0.0.1:8536:8536" - "127.0.0.1:8536:8536"
restart: always restart: always

4
docker/travis/docker_push.sh vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
docker tag dessalines/lemmy:travis \ docker tag dessalines/lemmy:travis \
dessalines/lemmy:v0.7.50 dessalines/lemmy:v0.7.51
docker push dessalines/lemmy:v0.7.50 docker push dessalines/lemmy:v0.7.51

3
server/lemmy_db/src/community_view.rs
View File

@ -245,7 +245,8 @@ impl<'a> CommunityQueryBuilder<'a> {
.filter(user_id.is_null()) .filter(user_id.is_null())
} }
}, },
SortType::Hot | _ => { // Covers all other sorts, including hot
_ => {
query = query query = query
.order_by(hot_rank.desc()) .order_by(hot_rank.desc())
.then_order_by(number_of_subscribers.desc()) .then_order_by(number_of_subscribers.desc())

2
server/src/version.rs
View File

@ -1 +1 @@
pub const VERSION: &str = "v0.7.50"; pub const VERSION: &str = "v0.7.51";

2
ui/package.json vendored
View File

@ -73,7 +73,7 @@
"engineStrict": true, "engineStrict": true,
"husky": { "husky": {
"hooks": { "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": { "lint-staged": {