gitlab 4.2.0 → 4.18.0

data/lib/gitlab/client/lint.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Gitlab::Client
+  # Defines methods related to lint/validations.
+  # @see https://docs.gitlab.com/ce/api/lint.html
+  module Lint
+    # Checks if your .gitlab-ci.yml file is valid.
+    #
+    # @example
+    #   Gitlab.validate_gitlab_ci_yml("{ \"image\": \"ruby:2.6\", \"services\": [\"postgres\"], \"before_script\": [\"bundle install\", \"bundle exec rake db:create\"], \"variables\": {\"DB_NAME\": \"postgres\"}, \"types\": [\"test\", \"deploy\", \"notify\"], \"rspec\": { \"script\": \"rake spec\", \"tags\": [\"ruby\", \"postgres\"], \"only\": [\"branches\"]}}")
+    #
+    # @param  [String] content the .gitlab-ci.yaml content.
+    # @return <Gitlab::ObjectifiedHash> Returns information about validity of the yml.
+    def validate_gitlab_ci_yml(content)
+      body = { content: content }
+      post('/lint', body: body)
+    end
+  end
+end

data/lib/gitlab/client/markdown.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Gitlab::Client
+  # Defines methods related to markdown.
+  # @see https://docs.gitlab.com/ce/api/markdown.html
+  module Markdown
+    # Render an arbitrary Markdown document
+    #
+    # @example
+    #   Gitlab.markdown('Hello world! :tada:')
+    #   Gitlab.markdown('Hello world! :tada:', gfm: true, project: 'group_example/project_example')
+    #
+    # @param  [String] text The markdown text to render.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Boolean] :gfm(optional) Render text using GitLab Flavored Markdown. Default is false.
+    # @option options [String] :project(optional) Use project as a context when creating references using GitLab Flavored Markdown. Authentication is required if a project is not public.
+    # @return <Gitlab::ObjectifiedHash> Returns the rendered markdown as response
+    def markdown(text, options = {})
+      body = { text: text }.merge(options)
+      post('/markdown', body: body)
+    end
+  end
+end

data/lib/gitlab/client/merge_request_approvals.rb

@@ -0,0 +1,265 @@
+# frozen_string_literal: true
+
+class Gitlab::Client
+  # Defines methods related to MR Approvals.
+  # @see https://docs.gitlab.com/ee/api/merge_request_approvals.html
+  module MergeRequestApprovals
+    # Gets MR Approval Configuration for a project
+    #
+    # @example
+    #   Gitlab.project_merge_request_approvals(1)
+    #
+    # @param [Integer] project The ID of a project.
+    # @return [Gitlab::ObjectifiedHash] MR approval configuration information about the project
+    def project_merge_request_approvals(project)
+      get("/projects/#{url_encode project}/approvals")
+    end
+
+    # Change MR Approval Configuration for a project
+    #
+    # @example
+    #    Gitlab.edit_project_merge_request_approvals(1, {approvals_before_merge: 3})
+    #    Gitlab.edit_project_merge_request_approvals(1, {approvals_before_merge: 3, reset_approvals_on_push: true})
+    #    Gitlab.edit_project_merge_request_approvals(1, {approvals_before_merge: 3, disable_overriding_approvers_per_merge_request: false})
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @option options [Integer] :approvals_before_merge(optional) How many approvals are required before an MR can be merged
+    # @option options [Boolean] :reset_approvals_on_push(optional) Reset approvals on a new push
+    # @option options [Boolean] :disable_overriding_approvers_per_merge_request(optional) Allow/Disallow overriding approvers per MR
+    # @return [Gitlab::ObjectifiedHash] MR approval configuration information about the project
+    def edit_project_merge_request_approvals(project, options = {})
+      post("/projects/#{url_encode project}/approvals", body: options)
+    end
+
+    # Gets MR Approval Rules for a project
+    #
+    # @example
+    #   Gitlab.project_merge_request_approval_rules(1)
+    #
+    # @param [Integer] project The ID of a project.
+    # @return [Gitlab::ObjectifiedHash] MR approval rules for the project
+    def project_merge_request_approval_rules(project)
+      get("/projects/#{url_encode project}/approval_rules")
+    end
+
+    # Create MR Approval Rule for a project
+    #
+    # @example
+    #   Gitlab.create_project_merge_request_approval_rule(1, {name: "security", approvals_required: 1})
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @option options [String] :name(required) The name of the approval rule
+    # @option options [Integer] :approvals_required(required) The number of required approvals for this rule
+    # @option options [Array] :user_ids(optional) The ids of users as approvers
+    # @option options [Array] :group_ids(optional) The ids of groups as approvers
+    # @option options [Array] :protected_branch_ids(optional) The ids of protected branches to scope the rule by
+    # @return [Gitlab::ObjectifiedHash] New MR approval rule
+    def create_project_merge_request_approval_rule(project, options = {})
+      post("/projects/#{url_encode project}/approval_rules", body: options)
+    end
+
+    # Update MR Approval Rule for a project
+    #
+    # @example
+    #   Gitlab.update_project_merge_request_approval_rule(1, {name: "security", approvals_required: 2})
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] approval_rule_id(required) The ID of a project Approval Rule
+    # @option options [String] :name(required) The name of the approval rule
+    # @option options [Integer] :approvals_required(required) The number of required approvals for this rule
+    # @option options [Array] :user_ids(optional) The ids of users as approvers
+    # @option options [Array] :group_ids(optional) The ids of groups as approvers
+    # @option options [Array] :protected_branch_ids(optional) The ids of protected branches to scope the rule by
+    # @return [Gitlab::ObjectifiedHash] Updated MR approval rule
+    def update_project_merge_request_approval_rule(project, approval_rule_id, options = {})
+      put("/projects/#{url_encode project}/approval_rules/#{approval_rule_id}", body: options)
+    end
+
+    # Delete MR Approval Rule for a project
+    #
+    # @example
+    #   Gitlab.delete_project_merge_request_approval_rule(1, 1)
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] approval_rule_id(required) The ID of a approval rule
+    # @return [void] This API call returns an empty response body
+    def delete_project_merge_request_approval_rule(project, approval_rule_id)
+      delete("/projects/#{url_encode project}/approval_rules/#{approval_rule_id}")
+    end
+
+    # Change allowed approvers and approver groups for a project
+    # @deprecated Since Gitlab 13.12 /approvers endpoints are removed!!!
+    # See Gitlab.create_project_merge_request_approval_rule
+    #
+    # @example
+    #    Gitlab.edit_project_approvers(1, {approver_ids: [5], approver_groups: [1]})
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @option options [Array] :approver_ids(required, nil if none) An array of User IDs that can approve MRs
+    # @option options [Array] :approver_group_ids(required, nil if none) An array of Group IDs whose members can approve MRs
+    # @return [Gitlab::ObjectifiedHash] MR approval configuration information about the project
+    def edit_project_approvers(project, options = {})
+      put("/projects/#{url_encode project}/approvers", body: options)
+    end
+
+    # Get Configuration for approvals on a specific Merge Request.
+    #
+    # @example
+    #    Gitlab.merge_request_approvals(1, 5)
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge_request.
+    # @return [Gitlab::ObjectifiedHash] MR approval configuration information about the merge request
+    def merge_request_approvals(project, merge_request)
+      get("/projects/#{url_encode project}/merge_requests/#{merge_request}/approvals")
+    end
+
+    # Change configuration for approvals on a specific merge request.
+    #
+    # @example
+    #    Gitlab.edit_merge_request_approvals(1, 5, approvals_required: 2)
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge_request.
+    # @option options [Integer] :approvals_required(required) Approvals required before MR can be merged
+    # @return [Gitlab::ObjectifiedHash] Updated MR approval configuration information about the merge request
+    def edit_merge_request_approvals(project, merge_request, options = {})
+      post("/projects/#{url_encode project}/merge_requests/#{merge_request}/approvals", body: options)
+    end
+
+    # Change allowed approvers and approver groups for a merge request
+    # @deprecated Since Gitlab 13.12 /approvers endpoints are removed!!!
+    # See Gitlab.create_merge_request_level_rule
+    #
+    # @example
+    #    Gitlab.edit_merge_request_approvers(1, 5, {approver_ids: [5], approver_groups: [1]})
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge_request.
+    # @option options [Array] :approver_ids(required, nil if none) An array of User IDs that can approve MRs
+    # @option options [Array] :approver_group_ids(required, nil if none) An array of Group IDs whose members can approve MRs
+    # @return [Gitlab::ObjectifiedHash] MR approval configuration information about the project
+    def edit_merge_request_approvers(project, merge_request, options = {})
+      put("/projects/#{url_encode project}/merge_requests/#{merge_request}/approvers", body: options)
+    end
+
+    # Create merge request level rule
+    #
+    # @example
+    #   Gitlab.create_merge_request_level_rule(1, 2, {
+    #     name: "devs",
+    #     approvals_required: 2,
+    #     approval_project_rule_id: 99,
+    #     user_ids: [3, 4],
+    #     group_ids: [5, 6],
+    #   })
+    #
+    # Important: When approval_project_rule_id is set, the name, users and groups of project-level rule are copied.
+    # The approvals_required specified is used.
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge request.
+    # @option options [String] :name(required) The name of the approval rule
+    # @option options [Integer] :approvals_required(required) The number of required approvals for this rule
+    # @option options [Integer] :approval_project_rule_id(optional) The ID of a project-level approval rule
+    # @option options [Array] :user_ids(optional) The ids of users as approvers
+    # @option options [Array] :group_ids(optional) The ids of groups as approvers
+    # @return [Gitlab::ObjectifiedHash] New MR level approval rule
+    def create_merge_request_level_rule(project, merge_request, options = {})
+      post("/projects/#{url_encode project}/merge_requests/#{merge_request}/approval_rules", body: options)
+    end
+
+    # Get merge request level rule
+    #
+    # @example
+    #   Gitlab.merge_request_level_rule(1, 2)
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge request.
+    # @return [Gitlab::ObjectifiedHash] New MR level approval rule
+    def merge_request_level_rule(project, merge_request)
+      get("/projects/#{url_encode project}/merge_requests/#{merge_request}/approval_rules")
+    end
+
+    # Update merge request level rule
+    #
+    # @example
+    #   Gitlab.update_merge_request_level_rule(1, 2, 69, {
+    #     name: "devs",
+    #     approvals_required: 2,
+    #     user_ids: [3, 4],
+    #     group_ids: [5, 6],
+    #   })
+    #
+    # Important: Approvers and groups not in the users/groups parameters are removed
+    # Important: Updating a report_approver or code_owner rule is not allowed.
+    # These are system generated rules.
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge request.
+    # @param [Integer] appr_rule_id(required) The ID of a approval rule
+    # @option options [String] :name(required) The name of the approval rule
+    # @option options [Integer] :approvals_required(required) The number of required approvals for this rule
+    # @option options [Array] :user_ids(optional) The ids of users as approvers
+    # @option options [Array] :group_ids(optional) The ids of groups as approvers
+    # @return [Gitlab::ObjectifiedHash] Updated MR level approval rule
+    def update_merge_request_level_rule(project, merge_request, appr_rule_id, options = {})
+      put("/projects/#{url_encode project}/merge_requests/#{merge_request}/approval_rules/#{appr_rule_id}", body: options)
+    end
+
+    # Delete merge request level rule
+    #
+    # @example
+    #   Gitlab.delete_merge_request_level_rule(1, 2, 69)
+    #
+    # Important: Deleting a report_approver or code_owner rule is not allowed.
+    # These are system generated rules.
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge request.
+    # @param [Integer] appr_rule_id(required) The ID of a approval rule
+    # @return [void] This API call returns an empty response body
+    def delete_merge_request_level_rule(project, merge_request, appr_rule_id)
+      delete("/projects/#{url_encode project}/merge_requests/#{merge_request}/approval_rules/#{appr_rule_id}")
+    end
+
+    # Approve a merge request
+    #
+    # @example
+    #    Gitlab.approve_merge_request(1, 5)
+    #    Gitlab.approve_merge_request(1, 5, sha: 'fe678da')
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge request.
+    # @option options [String] :sha(optional) The HEAD of the MR
+    # @return [Gitlab::ObjectifiedHash] MR approval configuration information about the project
+    def approve_merge_request(project, merge_request, options = {})
+      post("/projects/#{url_encode project}/merge_requests/#{merge_request}/approve", body: options)
+    end
+
+    # Unapprove a merge request
+    #
+    # @example
+    #    Gitlab.unapprove_merge_request(1, 5)
+    #
+    # @param [Integer] project(required) The ID of a project.
+    # @param [Integer] merge_request(required) The IID of a merge request.
+    # @option options [String] :sudo(optional) The username of the user you want to remove the approval for
+    # @return [void] This API call returns an empty response body.
+    def unapprove_merge_request(project, merge_request, options = {})
+      post("/projects/#{url_encode project}/merge_requests/#{merge_request}/unapprove", body: options)
+    end
+
+    # Get the approval state of merge requests
+    #
+    # @example
+    #   Gitlab.merge_request_approval_state(5, 36)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def merge_request_approval_state(project, id)
+      get("/projects/#{url_encode project}/merge_requests/#{id}/approval_state")
+    end
+  end
+end

data/lib/gitlab/client/merge_requests.rb

@@ -1,19 +1,33 @@
+# frozen_string_literal: true
+
 class Gitlab::Client
   # Defines methods related to merge requests.
   # @see https://docs.gitlab.com/ce/api/merge_requests.html
   module MergeRequests
+    # Gets a list of all of the merge requests the authenticated user has access to.
+    #
+    # @example
+    #   Gitlab.user_merge_requests
+    #   Gitlab.user_merge_requests(state: :opened, scope: :all)
+    #
+    # @param  [Hash] options A customizable set of options.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def user_merge_requests(options = {})
+      get('/merge_requests', query: options)
+    end
+
     # Gets a list of project merge requests.
     #
     # @example
     #   Gitlab.merge_requests(5)
-    #   Gitlab.merge_requests({ per_page: 40 })
+    #   Gitlab.merge_requests(5, { per_page: 40 })
     #
     # @param  [Integer, String] project The ID or name of a project.
     # @param  [Hash] options A customizable set of options.
     # @option options [Integer] :page The page number.
     # @option options [Integer] :per_page The number of results per page.
     # @return [Array<Gitlab::ObjectifiedHash>]
-    def merge_requests(project, options={})
+    def merge_requests(project, options = {})
       get("/projects/#{url_encode project}/merge_requests", query: options)
     end
 
@@ -21,12 +35,59 @@ class Gitlab::Client
     #
     # @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 <Gitlab::ObjectifiedHash]
-    def merge_request(project, id)
-      get("/projects/#{url_encode project}/merge_requests/#{id}")
+    def merge_request(project, id, options = {})
+      get("/projects/#{url_encode project}/merge_requests/#{id}", query: options)
+    end
+
+    # Gets a list of merge request pipelines.
+    #
+    # @example
+    #   Gitlab.merge_request_pipelines(5, 36)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def merge_request_pipelines(project, id)
+      get("/projects/#{url_encode project}/merge_requests/#{id}/pipelines")
+    end
+
+    # Create a new pipeline for a merge request.
+    # A pipeline created via this endpoint doesnt run a regular branch/tag pipeline.
+    # It requires .gitlab-ci.yml to be configured with only: [merge_requests] to create jobs.
+    #
+    # The new pipeline can be:
+    #
+    # A detached merge request pipeline.
+    # A pipeline for merged results if the project setting is enabled.
+    #
+    # @example
+    #   Gitlab.create_merge_request_pipeline(5, 36)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] iid The internal ID of a merge request.
+    # @return [Gitlab::ObjectifiedHash]
+    def create_merge_request_pipeline(project, iid)
+      post("/projects/#{url_encode project}/merge_requests/#{iid}/pipelines")
+    end
+
+    # Get a list of merge request participants.
+    #
+    # @example
+    #   Gitlab.merge_request_participants(5, 36)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def merge_request_participants(project, id)
+      get("/projects/#{url_encode project}/merge_requests/#{id}/participants")
     end
 
     # Creates a merge request.
@@ -43,9 +104,16 @@ class Gitlab::Client
     # @option options [String] :source_branch (required) The source branch name.
     # @option options [String] :target_branch (required) The target branch name.
     # @option options [Integer] :assignee_id (optional) The ID of a user to assign merge request.
+    # @option options [Array<Integer>] :assignee_ids (optional) The ID of the user(s) to assign the MR to. Set to 0 or provide an empty value to unassign all assignees.
+    # @option options [String] :description (optional) Description of MR. Limited to 1,048,576 characters.
     # @option options [Integer] :target_project_id (optional) The target project ID.
+    # @option options [String] :labels (optional) Labels as a comma-separated list.
+    # @option options [Integer] :milestone_id (optional) The global ID of a milestone
+    # @option options [Boolean] :remove_source_branch (optional) Flag indicating if a merge request should remove the source branch when merging
+    # @option options [Boolean] :allow_collaboration (optional) Allow commits from members who can merge to the target branch
+    # @option options [Boolean] :squash (optional) Squash commits into a single commit when merging
     # @return [Gitlab::ObjectifiedHash] Information about created merge request.
-    def create_merge_request(project, title, options={})
+    def create_merge_request(project, title, options = {})
       body = { title: title }.merge(options)
       post("/projects/#{url_encode project}/merge_requests", body: body)
     end
@@ -64,7 +132,7 @@ class Gitlab::Client
     # @option options [Integer] :assignee_id The ID of a user to assign merge request.
     # @option options [String] :state_event New state (close|reopen|merge).
     # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
-    def update_merge_request(project, id, options={})
+    def update_merge_request(project, id, options = {})
       put("/projects/#{url_encode project}/merge_requests/#{id}", body: options)
     end
 
@@ -76,9 +144,14 @@ class Gitlab::Client
     # @param  [Integer, String] project The ID or name of a project.
     # @param  [Integer] id The ID of a merge request.
     # @param  [Hash] options A customizable set of options.
-    # @option options [String] :merge_commit_message Custom merge commit message
+    # @option options [String] :merge_commit_message(optional) Custom merge commit message
+    # @option options [String] :squash_commit_message(optional) Custom squash commit message
+    # @option options [Boolean] :squash(optional) if true the commits will be squashed into a single commit on merge
+    # @option options [Boolean] :should_remove_source_branch(optional) if true removes the source branch
+    # @option options [Boolean] :merge_when_pipeline_succeeds(optional) if true the MR is merged when the pipeline succeeds
+    # @option options [String] :sha(optional) if present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail
     # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
-    def accept_merge_request(project, id, options={})
+    def accept_merge_request(project, id, options = {})
       put("/projects/#{url_encode project}/merge_requests/#{id}/merge", body: options)
     end
 
@@ -114,7 +187,7 @@ class Gitlab::Client
     # @param [Integer] project The ID of a project
     # @param [Integer] iid The internal ID of a merge request
     def merge_request_closes_issues(project_id, merge_request_iid)
-      get("/projects/#{project_id}/merge_requests/#{merge_request_iid}/closes_issues")
+      get("/projects/#{url_encode project_id}/merge_requests/#{merge_request_iid}/closes_issues")
     end
 
     # Subscribes to a merge request.
@@ -142,5 +215,160 @@ class Gitlab::Client
     def unsubscribe_from_merge_request(project, id)
       post("/projects/#{url_encode project}/merge_requests/#{id}/unsubscribe")
     end
+
+    # List project merge request discussions
+    #
+    # @example
+    #   Gitlab.merge_request_discussions(5, 1)
+    #   Gitlab.merge_request_discussions('gitlab', 1)
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return [Gitlab::ObjectifiedHash] List of the merge request discussions.
+    def merge_request_discussions(project, merge_request_id)
+      get("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/discussions")
+    end
+
+    # Get single merge request discussion
+    #
+    # @example
+    #   Gitlab.merge_request_discussion(5, 1, 1)
+    #   Gitlab.merge_request_discussion('gitlab', 1, 1)
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Integer] discussion_id The ID of a discussion.
+    # @return [Gitlab::ObjectifiedHash] The merge request discussion.
+    def merge_request_discussion(project, merge_request_id, discussion_id)
+      get("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/discussions/#{discussion_id}")
+    end
+
+    # Create new merge request discussion
+    #
+    # @example
+    #   Gitlab.create_merge_request_discussion(5, 1, body: 'discuss')
+    #   Gitlab.create_merge_request_discussion('gitlab', 1, body: 'discuss')
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Hash] options A customizable set of options.
+    #   * :body (String) The content of a discussion
+    #   * :created_at (String) Date time string, ISO 8601 formatted, e.g. 2016-03-11T03:45:40Z
+    #   * :position (Hash) Position when creating a diff note
+    #     * :base_sha (String) Base commit SHA in the source branch
+    #     * :start_sha (String) SHA referencing commit in target branch
+    #     * :head_sha (String) SHA referencing HEAD of this merge request
+    #     * :position_type (String) Type of the position reference', allowed values: 'text' or 'image'
+    #     * :new_path (String) File path after change
+    #     * :new_line (Integer) Line number after change (for 'text' diff notes)
+    #     * :old_path (String) File path before change
+    #     * :old_line (Integer) Line number before change (for 'text' diff notes)
+    #     * :width (Integer) Width of the image (for 'image' diff notes)
+    #     * :height (Integer) Height of the image (for 'image' diff notes)
+    #     * :x (Integer) X coordinate (for 'image' diff notes)
+    #     * :y (Integer) Y coordinate (for 'image' diff notes)
+    # @return [Gitlab::ObjectifiedHash] The created merge request discussion.
+    def create_merge_request_discussion(project, merge_request_id, options = {})
+      post("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/discussions", body: options)
+    end
+
+    # Resolve a merge request discussion
+    #
+    # @example
+    #   Gitlab.resolve_merge_request_discussion(5, 1, 1, true)
+    #   Gitlab.resolve_merge_request_discussion('gitlab', 1, 1, false)
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Integer] discussion_id The ID of a discussion.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Boolean] :resolved Resolve/unresolve the discussion.
+    # @return [Gitlab::ObjectifiedHash] The merge request discussion.
+    def resolve_merge_request_discussion(project, merge_request_id, discussion_id, options)
+      put("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/discussions/#{discussion_id}", body: options)
+    end
+
+    # Add note to existing merge request discussion
+    #
+    # @example
+    #   Gitlab.create_merge_request_discussion_note(5, 1, 1, note_id: 1, body: 'note')
+    #   Gitlab.create_merge_request_discussion_note('gitlab', 1, 1, note_id: 1, body: 'note')
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Integer] discussion_id The ID of a discussion.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Integer] :note_id The ID of a discussion note.
+    # @option options [String] :body The content of a discussion.
+    # @option options [String] :created_at Date time string, ISO 8601 formatted, e.g. 2016-03-11T03:45:40Z.
+    # @return [Gitlab::ObjectifiedHash] The merge request discussion note.
+    def create_merge_request_discussion_note(project, merge_request_id, discussion_id, options)
+      post("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/discussions/#{discussion_id}/notes", body: options)
+    end
+
+    # Modify an existing merge request discussion note
+    #
+    # @example
+    #   Gitlab.update_merge_request_discussion_note(5, 1, 1, 1, body: 'note')
+    #   Gitlab.update_merge_request_discussion_note('gitlab', 1, 1, 1, body: 'note')
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Integer] discussion_id The ID of a discussion.
+    # @param  [Integer] note_id The ID of a discussion note.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :body The content of a discussion.
+    # @option options [Boolean] :resolved Resolve/unresolve the note.
+    # @return [Gitlab::ObjectifiedHash] The merge request discussion note.
+    def update_merge_request_discussion_note(project, merge_request_id, discussion_id, note_id, options)
+      put("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/discussions/#{discussion_id}/notes/#{note_id}", body: options)
+    end
+
+    # Delete a merge request discussion note
+    #
+    # @example
+    #   Gitlab.delete_merge_request_discussion_note(5, 1, 1, 1)
+    #   Gitlab.delete_merge_request_discussion_note('gitlab', 1, 1, 1)
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Integer] discussion_id The ID of a discussion.
+    # @param  [Integer] note_id The ID of a discussion note.
+    # @return [Gitlab::ObjectifiedHash] An empty response.
+    def delete_merge_request_discussion_note(project, merge_request_id, discussion_id, note_id)
+      delete("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/discussions/#{discussion_id}/notes/#{note_id}")
+    end
+
+    # Gets a list of merge request diff versions
+    #
+    # @example
+    #   Gitlab.merge_request_versions(5, 1)
+    #   Gitlab.merge_request_versions('gitlab', 1)
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return [Gitlab::ObjectifiedHash] A list of the merge request versions.
+    def merge_request_diff_versions(project, merge_request_id)
+      get("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/versions")
+    end
+
+    # Gets the diff a single merge request diff version\
+    #
+    # @example
+    #   Gitlab.merge_request_diff_version(5, 1, 1)
+    #   Gitlab.merge_request_diff_version('gitlab', 1, 1)
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Integer] id The ID of a merge request diff version.
+    # @return [Gitlab::ObjectifiedHash] Record of the specific diff
+    def merge_request_diff_version(project, merge_request_id, version_id)
+      get("/projects/#{url_encode project}/merge_requests/#{merge_request_id}/versions/#{version_id}")
+    end
+
+    # Rebase a merge request.
+    #
+    # @example
+    #   Gitlab.rebase_merge_request(5, 42, { skip_ci: true })
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :skip_ci Set to true to skip creating a CI pipeline
+    # @return [Gitlab::ObjectifiedHash] Rebase progress status
+    def rebase_merge_request(project, id, options = {})
+      put("/projects/#{url_encode project}/merge_requests/#{id}/rebase", body: options)
+    end
   end
 end