orhun
diff --git a/‎.github/ISSUE_TEMPLATE/github_integration.yml renamed to ‎.github/ISSUE_TEMPLATE/integration.yml
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎.github/ISSUE_TEMPLATE/github_integration.yml renamed to ‎.github/ISSUE_TEMPLATE/integration.yml
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎.github/fixtures/test-github-integration/cliff.toml
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion b/‎.github/fixtures/test-github-integration/cliff.toml
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎.github/fixtures/test-gitlab-integration/cliff.toml
Copy file name to clipboard
+54Lines changed: 54 additions & 0 deletions b/‎.github/fixtures/test-gitlab-integration/cliff.toml
Copy file name to clipboard
+54Lines changed: 54 additions & 0 deletions
diff --git a/‎.github/fixtures/test-gitlab-integration/commit.sh
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎.github/fixtures/test-gitlab-integration/commit.sh
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎.github/fixtures/test-gitlab-integration/expected.md
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/‎.github/fixtures/test-gitlab-integration/expected.md
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
diff --git a/‎Cargo.lock
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎Cargo.lock
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎Dockerfile
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎Dockerfile
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎git-cliff-core/Cargo.toml
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions b/‎git-cliff-core/Cargo.toml
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎git-cliff-core/src/changelog.rs
Copy file name to clipboard
+115-18Lines changed: 115 additions & 18 deletions b/‎git-cliff-core/src/changelog.rs
Copy file name to clipboard
+115-18Lines changed: 115 additions & 18 deletions
diff --git a/‎git-cliff-core/src/commit.rs
Copy file name to clipboard
+6-3Lines changed: 6 additions & 3 deletions b/‎git-cliff-core/src/commit.rs
Copy file name to clipboard
+6-3Lines changed: 6 additions & 3 deletions
@@ -1,14 +1,14 @@
-name: GitHub Integration ⚙️
-description: Report a bug or request a feature about GitHub integration
-labels: ['github_integration']
-assignees: 
+name: Integration ⚙️
+description: Report a bug or request a feature about GitHub/GitLab integration
+labels: ["integration"]
+assignees:
   - orhun
 body:
   - type: markdown
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report!
-        Please see https://git-cliff.org/docs/integration/github for more information about GitHub integration.
+        Please see https://git-cliff.org/docs/category/integration for more information about GitHub/GitLab integration.
   - type: checkboxes
     id: new-bug
     attributes:
 
@@ -20,7 +20,10 @@ body = """
   ## New Contributors
 {%- endif %}\
 {% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}
-  * @{{ contributor.username }} made their first contribution in #{{ contributor.pr_number }}
+  * @{{ contributor.username }} made their first contribution
+    {%- if contributor.pr_number %} in \
+      [#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \
+    {%- endif %}
 {%- endfor -%}
 
 {% if version %}
 
@@ -0,0 +1,54 @@
+[remote.gitlab]
+owner = "dark0dave"
+repo = "dotfiles"
+
+[changelog]
+# template for the changelog body
+# https://keats.github.io/tera/docs/#introduction
+body = """
+## What's Changed
+
+{%- if version %} in {{ version }}{%- endif -%}
+{% for commit in commits %}
+  * {{ commit.message | split(pat="\n") | first | trim }}\
+    {% if commit.gitlab.username %} by @{{ commit.gitlab.username }}{%- endif -%}
+    {% if commit.gitlab.pr_number %} in #{{ commit.gitlab.pr_number }}{%- endif %}
+{%- endfor -%}
+
+{% if gitlab.contributors | filter(attribute="is_first_time", value=true) | length != 0 %}
+  {% raw %}\n{% endraw -%}
+  ## New Contributors
+{%- endif %}\
+{% for contributor in gitlab.contributors | filter(attribute="is_first_time", value=true) %}
+  * @{{ contributor.username }} made their first contribution
+    {%- if contributor.pr_number %} in \
+      [#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \
+    {%- endif %}
+{%- endfor -%}
+
+{% if version %}
+    {% if previous.version %}
+      **Full Changelog**: https://gitlab.com/{{ remote.gitlab.owner }}/{{ remote.gitlab.repo }}/compare/{{ previous.version }}...{{ version }}
+    {% endif %}
+{% else -%}
+  {% raw %}\n{% endraw %}
+{% endif %}
+"""
+# remove the leading and trailing whitespace from the template
+trim = true
+# changelog footer
+footer = """\n
+<!-- generated by git-cliff -->
+"""
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = false
+# filter out the commits that are not conventional
+filter_unconventional = true
+# process each line of a commit as an individual commit
+split_commits = false
+# regex for preprocessing the commit messages
+commit_preprocessors = [{ pattern = '\((\w+\s)?#([0-9]+)\)', replace = "" }]
+# protect breaking changes from being skipped due to matching a skipping commit_parser
+protect_breaking_commits = false
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -e
+
+git remote add origin https://gitlab.com/dark0dave/dotfiles
+git pull origin main
+git fetch --tags
+git checkout 3c048a1
@@ -0,0 +1,18 @@
+## What's Changed
+* Initial commit by @dark0dave
+* Added tmux files by @dark0dave
+* Updated readme by @dark0dave
+* Updated readme and added zshrc files by @dark0dave
+* Added python files by @dark0dave
+* Added curl files by @dark0dave
+* Zsh update by @dark0dave
+* Update README.md by @dark0dave
+* Fix for path by @dark0dave
+* Update README.md by @dark0dave
+* Started setup files by @dark0dave
+* Updated tmux to be a little nicer by @dark0dave
+* Merge branch 'feature/tmux-improvements' into 'master' by @dark0dave in #2
+
+
+
+<!-- generated by git-cliff -->
@@ -11,7 +11,7 @@ COPY --from=planner /app/recipe.json recipe.json
 ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 RUN cargo chef cook --release --recipe-path recipe.json
 COPY . .
-RUN cargo build --release --locked --no-default-features --features github
+RUN cargo build --release --locked --no-default-features --features github --features gitlab
 RUN rm -f target/release/deps/git_cliff*
 
 FROM debian:buster-slim as runner
 
@@ -27,6 +27,16 @@ github = [
   "dep:tokio",
   "dep:futures",
 ]
+## Enable integration with GitLab.
+## You can turn this off if you don't use GitLab and don't want
+## to make network requests to the GitLab API.
+gitlab = [
+  "dep:reqwest",
+  "dep:http-cache-reqwest",
+  "dep:reqwest-middleware",
+  "dep:tokio",
+  "dep:futures",
+]
 
 [dependencies]
 glob = { workspace = true, optional = true }
@@ -59,6 +69,7 @@ tokio = { version = "1.37.0", features = [
 ], optional = true }
 futures = { version = "0.3.30", optional = true }
 url = "2.5.0"
+dyn-clone = "1.0.17"
 
 [dependencies.git2]
 version = "0.18.3"
 
@@ -4,18 +4,14 @@ use crate::config::{
 	GitConfig,
 };
 use crate::error::Result;
-#[cfg(feature = "github")]
-use crate::github::{
-	GitHubClient,
-	GitHubCommit,
-	GitHubPullRequest,
-	FINISHED_FETCHING_MSG,
-	START_FETCHING_MSG,
-};
 use crate::release::{
 	Release,
 	Releases,
 };
+#[cfg(feature = "github")]
+use crate::remote::github::GitHubClient;
+#[cfg(feature = "gitlab")]
+use crate::remote::gitlab::GitLabClient;
 use crate::template::Template;
 use std::collections::HashMap;
 use std::io::Write;
@@ -198,19 +194,24 @@ impl<'a> Changelog<'a> {
 	/// If no GitHub related variable is used in the template then this function
 	/// returns empty vectors.
 	#[cfg(feature = "github")]
-	fn get_github_metadata(
-		&self,
-	) -> Result<(Vec<GitHubCommit>, Vec<GitHubPullRequest>)> {
-		if self.body_template.contains_github_variable() ||
+	fn get_github_metadata(&self) -> Result<crate::remote::RemoteMetadata> {
+		use crate::remote::github;
+		if self
+			.body_template
+			.contains_variable(github::TEMPLATE_VARIABLES) ||
 			self.footer_template
 				.as_ref()
-				.map(|v| v.contains_github_variable())
+				.map(|v| v.contains_variable(github::TEMPLATE_VARIABLES))
 				.unwrap_or(false)
 		{
 			warn!("You are using an experimental feature! Please report bugs at <https://git-cliff.org/issues>");
 			let github_client =
 				GitHubClient::try_from(self.config.remote.github.clone())?;
-			info!("{START_FETCHING_MSG} ({})", self.config.remote.github);
+			info!(
+				"{} ({})",
+				github::START_FETCHING_MSG,
+				self.config.remote.github
+			);
 			let data = tokio::runtime::Builder::new_multi_thread()
 				.enable_all()
 				.build()?
@@ -223,7 +224,73 @@ impl<'a> Changelog<'a> {
 					debug!("Number of GitHub pull requests: {}", commits.len());
 					Ok((commits, pull_requests))
 				});
-			info!("{FINISHED_FETCHING_MSG}");
+			info!("{}", github::FINISHED_FETCHING_MSG);
+			data
+		} else {
+			Ok((vec![], vec![]))
+		}
+	}
+
+	/// Returns the GitLab metadata needed for the changelog.
+	///
+	/// This function creates a multithread async runtime for handling the
+	///
+	/// requests. The following are fetched from the GitLab REST API:
+	///
+	/// - Commits
+	/// - Marge requests
+	///
+	/// Each of these are paginated requests so they are being run in parallel
+	/// for speedup.
+	///
+	///
+	/// If no GitLab related variable is used in the template then this function
+	/// returns empty vectors.
+	#[cfg(feature = "gitlab")]
+	fn get_gitlab_metadata(&self) -> Result<crate::remote::RemoteMetadata> {
+		use crate::remote::gitlab;
+		if self
+			.body_template
+			.contains_variable(gitlab::TEMPLATE_VARIABLES) ||
+			self.footer_template
+				.as_ref()
+				.map(|v| v.contains_variable(gitlab::TEMPLATE_VARIABLES))
+				.unwrap_or(false)
+		{
+			warn!("You are using an experimental feature! Please report bugs at <https://git-cliff.org/issues>");
+			let gitlab_client =
+				GitLabClient::try_from(self.config.remote.gitlab.clone())?;
+			info!(
+				"{} ({})",
+				gitlab::START_FETCHING_MSG,
+				self.config.remote.gitlab
+			);
+			let data = tokio::runtime::Builder::new_multi_thread()
+				.enable_all()
+				.build()?
+				.block_on(async {
+					// Map repo/owner to gitlab id
+					let project_id = match tokio::join!(gitlab_client.get_project())
+					{
+						(Ok(project),) => project.id,
+						(Err(err),) => {
+							error!("Failed to lookup project! {}", err);
+							return Err(err);
+						}
+					};
+					let (commits, merge_requests) = tokio::try_join!(
+						// Send id to these functions
+						gitlab_client.get_commits(project_id),
+						gitlab_client.get_merge_requests(project_id),
+					)?;
+					debug!("Number of GitLab commits: {}", commits.len());
+					debug!(
+						"Number of GitLab merge requests: {}",
+						merge_requests.len()
+					);
+					Ok((commits, merge_requests))
+				});
+			info!("{}", gitlab::FINISHED_FETCHING_MSG);
 			data
 		} else {
 			Ok((vec![], vec![]))
@@ -257,7 +324,19 @@ impl<'a> Changelog<'a> {
 			serde_json::to_value(self.config.remote.clone())?,
 		);
 		#[cfg(feature = "github")]
-		let (github_commits, github_pull_requests) = self.get_github_metadata()?;
+		let (github_commits, github_pull_requests) = if self.config.remote.github.is_set() {
+			self.get_github_metadata()
+				.expect("Could not get github metadata")
+		} else {
+			(vec![], vec![])
+		};
+		#[cfg(feature = "gitlab")]
+		let (gitlab_commits, gitlab_merge_request) = if self.config.remote.gitlab.is_set() {
+			self.get_gitlab_metadata()
+				.expect("Could not get gitlab metadata")
+		} else {
+			(vec![], vec![])
+		};
 		let postprocessors = self
 			.config
 			.changelog
@@ -279,6 +358,11 @@ impl<'a> Changelog<'a> {
 				github_commits.clone(),
 				github_pull_requests.clone(),
 			)?;
+			#[cfg(feature = "gitlab")]
+			release.update_gitlab_metadata(
+				gitlab_commits.clone(),
+				gitlab_merge_request.clone(),
+			)?;
 			let write_result = write!(
 				out,
 				"{}",
@@ -522,6 +606,11 @@ mod test {
 					repo:  String::from("awesome"),
 					token: None,
 				},
+				gitlab: Remote {
+					owner: String::from("coolguy"),
+					repo:  String::from("awesome"),
+					token: None,
+				},
 			},
 			bump:      Bump::default(),
 		};
@@ -589,7 +678,11 @@ mod test {
 			timestamp: 50000000,
 			previous: None,
 			#[cfg(feature = "github")]
-			github: crate::github::GitHubReleaseMetadata {
+			github: crate::remote::RemoteReleaseMetadata {
+				contributors: vec![],
+			},
+			#[cfg(feature = "gitlab")]
+			gitlab: crate::remote::RemoteReleaseMetadata {
 				contributors: vec![],
 			},
 		};
@@ -636,7 +729,11 @@ mod test {
 				timestamp: 1000,
 				previous: Some(Box::new(test_release)),
 				#[cfg(feature = "github")]
-				github: crate::github::GitHubReleaseMetadata {
+				github: crate::remote::RemoteReleaseMetadata {
+					contributors: vec![],
+				},
+				#[cfg(feature = "gitlab")]
+				gitlab: crate::remote::RemoteReleaseMetadata {
 					contributors: vec![],
 				},
 			},
 
@@ -8,8 +8,6 @@ use crate::error::{
 	Error as AppError,
 	Result,
 };
-#[cfg(feature = "github")]
-use crate::github::GitHubContributor;
 #[cfg(feature = "repo")]
 use git2::{
 	Commit as GitCommit,
@@ -126,7 +124,10 @@ pub struct Commit<'a> {
 	pub merge_commit:  bool,
 	/// GitHub metadata of the commit.
 	#[cfg(feature = "github")]
-	pub github:        GitHubContributor,
+	pub github:        crate::remote::RemoteContributor,
+	/// GitLab metadata of the commit.
+	#[cfg(feature = "gitlab")]
+	pub gitlab:        crate::remote::RemoteContributor,
 }
 
 impl<'a> From<String> for Commit<'a> {
@@ -440,6 +441,8 @@ impl Serialize for Commit<'_> {
 		commit.serialize_field("merge_commit", &self.merge_commit)?;
 		#[cfg(feature = "github")]
 		commit.serialize_field("github", &self.github)?;
+		#[cfg(feature = "gitlab")]
+		commit.serialize_field("gitlab", &self.gitlab)?;
 		commit.end()
 	}
 }