From fb176084ecbcb69b4a41b9ef3433d6a4c9464b2a Mon Sep 17 00:00:00 2001 From: Georg Semmler Date: Mon, 25 Nov 2024 15:54:20 +0000 Subject: [PATCH 1/3] Merge pull request #4358 from weiznich/fix/remove_gitter Remove gitter from the readme --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f85d92d1e53b..a11a5fe960a0 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,8 @@ Guides on more specific features are coming soon. ## Getting help If you run into problems, Diesel has a very active Gitter room. -You can come ask for help at -[gitter.im/diesel-rs/diesel](https://gitter.im/diesel-rs/diesel). -For help with longer questions and discussion about the future of Diesel, -open a discussion on [GitHub Discussions](/~https://github.com/diesel-rs/diesel/discussions). +You can come ask for help at in our [GitHub Discussions](/~https://github.com/diesel-rs/diesel/discussions) forum. +This is also the right place to propose new features or show your applications. ## Usage From c59ddfa8d8652a7a7cf8a79f6501375c1b736278 Mon Sep 17 00:00:00 2001 From: Georg Semmler Date: Tue, 26 Nov 2024 08:36:54 +0100 Subject: [PATCH 2/3] Remove more mentions of gitter --- CONTRIBUTING.md | 3 +-- README.md | 1 - diesel_dynamic_schema/README.md | 1 - diesel_dynamic_schema/src/lib.rs | 4 ++-- guide_drafts/trait_derives.md | 4 ++-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 34c138685732..5ee62b254ede 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,8 +3,7 @@ Thanks for your interest in contributing to Diesel! We very much look forward to your suggestions, bug reports, and pull requests. -We run an active [Gitter -channel](https://gitter.im/diesel-rs/diesel) where you can ask Diesel-related questions and +We run an active [discussion forum](/~https://github.com/diesel-rs/diesel/discussions) where you can ask Diesel-related questions and get help. Feel free to ask there before opening a GitHub issue or pull request. diff --git a/README.md b/README.md index a11a5fe960a0..64c5d7538c6e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ # A safe, extensible ORM and Query Builder for Rust [![Build Status](/~https://github.com/diesel-rs/diesel/workflows/CI%20Tests/badge.svg)](/~https://github.com/diesel-rs/diesel/actions?query=workflow%3A%22CI+Tests%22+branch%3Amaster) -[![Gitter](https://badges.gitter.im/diesel-rs/diesel.svg)](https://gitter.im/diesel-rs/diesel?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Crates.io](https://img.shields.io/crates/v/diesel.svg)](https://crates.io/crates/diesel) API Documentation: [latest release](https://docs.rs/diesel) – [master branch](https://docs.diesel.rs/master/diesel/index.html) diff --git a/diesel_dynamic_schema/README.md b/diesel_dynamic_schema/README.md index 8e59b791c595..29a5e4eb3d05 100644 --- a/diesel_dynamic_schema/README.md +++ b/diesel_dynamic_schema/README.md @@ -4,7 +4,6 @@ Query schemas not known at compile time with Diesel =================================================== [![Build Status](https://travis-ci.org/diesel-rs/diesel.svg)](https://travis-ci.org/diesel-rs/diesel-dynamic-schema) -[![Gitter](https://badges.gitter.im/diesel-rs/diesel.svg)](https://gitter.im/diesel-rs/diesel?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) API Documentation: [latest release](https://docs.rs/diesel-dynamic-schema) diff --git a/diesel_dynamic_schema/src/lib.rs b/diesel_dynamic_schema/src/lib.rs index 544d5146bcfe..f298869b397a 100644 --- a/diesel_dynamic_schema/src/lib.rs +++ b/diesel_dynamic_schema/src/lib.rs @@ -71,9 +71,9 @@ //! //! ## Getting help //! -//! If you run into problems, Diesel has a very active Gitter room. +//! If you run into problems, Diesel has a very active discussion forum. //! You can come ask for help at -//! [gitter.im/diesel-rs/diesel](https://gitter.im/diesel-rs/diesel) +//! [github.com/diesel-rs/diesel/discussions](/~https://github.com/diesel-rs/diesel/discussions) // Built-in Lints #![warn(missing_docs)] diff --git a/guide_drafts/trait_derives.md b/guide_drafts/trait_derives.md index 395aa453805e..bd119945d005 100644 --- a/guide_drafts/trait_derives.md +++ b/guide_drafts/trait_derives.md @@ -960,9 +960,9 @@ error[E0599]: no function or associated item named `belonging_to` found for type Please check out other [official guides] and [docs] for more information on using the Diesel framework. -If you have any questions, join our [gitter channel], +If you have any questions, join our [discussion forum], the Diesel team is happy to help. [official guides]: https://diesel.rs/guides/ [docs]: https://docs.diesel.rs -[gitter channel]: https://gitter.im/diesel-rs/diesel +[discussion forum]: /~https://github.com/diesel-rs/diesel/discussions From c880cea638a457d35159308a0e2f3e1b7d64133d Mon Sep 17 00:00:00 2001 From: Georg Semmler Date: Tue, 26 Nov 2024 08:37:33 +0100 Subject: [PATCH 3/3] Bump diesel to 2.2.6 to prepare a next release --- diesel/Cargo.toml | 2 +- diesel_cli/Cargo.toml | 2 +- diesel_dynamic_schema/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml index ff37611437e2..57230e5ca8c7 100644 --- a/diesel/Cargo.toml +++ b/diesel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "diesel" -version = "2.2.5" +version = "2.2.6" license = "MIT OR Apache-2.0" description = "A safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL" readme = "README.md" diff --git a/diesel_cli/Cargo.toml b/diesel_cli/Cargo.toml index f22d2b2ab879..17d5cdfb538d 100644 --- a/diesel_cli/Cargo.toml +++ b/diesel_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "diesel_cli" -version = "2.2.5" +version = "2.2.6" license = "MIT OR Apache-2.0" description = "Provides the CLI for the Diesel crate" readme = "README.md" diff --git a/diesel_dynamic_schema/Cargo.toml b/diesel_dynamic_schema/Cargo.toml index 4cfea0ec0aa1..778ff1b0ff5c 100644 --- a/diesel_dynamic_schema/Cargo.toml +++ b/diesel_dynamic_schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "diesel-dynamic-schema" -version = "0.2.2" +version = "0.2.3" license = "MIT OR Apache-2.0" edition = "2018" autotests = false