Thanks to visit codestin.com
Credit goes to github.com

Skip to content

add rebase merge request method #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NARKOZ merged 1 commit into from
Apr 12, 2021
Merged

add rebase merge request method #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions lib/gitlab/client/merge_requests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,5 +337,19 @@ def merge_request_diff_versions(project, merge_request_id)
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
3 changes: 3 additions & 0 deletions spec/fixtures/merge_request_rebase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"rebase_in_progress": true
}
17 changes: 17 additions & 0 deletions spec/gitlab/client/merge_requests_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,4 +407,21 @@
expect(@diff.diffs.first['old_path']).to eq('LICENSE')
end
end

describe '.rebase_merge_request' do
before do
stub_put('/projects/3/merge_requests/105/rebase', 'merge_request_rebase')
.with(body: { skip_ci: true })
@response = Gitlab.rebase_merge_request(3, 105, skip_ci: true)
end

it 'gets correct resource' do
expect(a_put('/projects/3/merge_requests/105/rebase')
.with(body: { skip_ci: true })).to have_been_made
end

it 'returns rebase in progress response' do
expect(@response.rebase_in_progress).to be_truthy
end
end
end