From 7fae0cd351700539bec93c318de5ee8968465474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kalemba?= Date: Fri, 26 Jun 2020 22:45:50 +0200 Subject: [PATCH 1/2] Add extra options for getting single merge request --- lib/gitlab/client/merge_requests.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/client/merge_requests.rb b/lib/gitlab/client/merge_requests.rb index 30e843c82..72d7f22e2 100644 --- a/lib/gitlab/client/merge_requests.rb +++ b/lib/gitlab/client/merge_requests.rb @@ -35,12 +35,16 @@ def merge_requests(project, options = {}) # # @example # Gitlab.merge_request(5, 36) + # Gitlab.merge_request(5, 36, { include_diverged_commits_count: true }) # # @param [Integer, String] project The ID or name of a project. # @param [Integer] id The ID of a merge request. + # @option options [Boolean] :render_html If true response includes rendered HTML for title and description. + # @option options [Boolean] :include_diverged_commits_count If true response includes the commits behind the target branch. + # @option options [Boolean] :include_rebase_in_progress If true response includes whether a rebase operation is in progress. # @return Date: Fri, 26 Jun 2020 22:58:44 +0200 Subject: [PATCH 2/2] Fix whitespace issue --- lib/gitlab/client/merge_requests.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/client/merge_requests.rb b/lib/gitlab/client/merge_requests.rb index 72d7f22e2..4b966c1b4 100644 --- a/lib/gitlab/client/merge_requests.rb +++ b/lib/gitlab/client/merge_requests.rb @@ -43,7 +43,7 @@ def merge_requests(project, options = {}) # @option options [Boolean] :include_diverged_commits_count If true response includes the commits behind the target branch. # @option options [Boolean] :include_rebase_in_progress If true response includes whether a rebase operation is in progress. # @return