Update other links
This commit is contained in:
parent
e211ef4e9d
commit
e40f8f27a1
|
@ -86,10 +86,10 @@ module CreatesCommit
|
|||
def new_merge_request_path
|
||||
project_new_merge_request_path(
|
||||
@project_to_commit_into,
|
||||
merge_request_source_branch: @branch_name,
|
||||
merge_request: {
|
||||
source_project_id: @project_to_commit_into.id,
|
||||
target_project_id: @project.id,
|
||||
source_branch: @branch_name,
|
||||
target_branch: @start_branch
|
||||
}
|
||||
)
|
||||
|
|
|
@ -13,8 +13,8 @@ module CompareHelper
|
|||
def create_mr_path(from = params[:from], to = params[:to], project = @project)
|
||||
project_new_merge_request_path(
|
||||
project,
|
||||
merge_request_source_branch: to,
|
||||
merge_request: {
|
||||
source_branch: to,
|
||||
target_branch: from
|
||||
}
|
||||
)
|
||||
|
|
|
@ -11,10 +11,10 @@ module MergeRequestsHelper
|
|||
|
||||
def new_mr_from_push_event(event, target_project)
|
||||
{
|
||||
merge_request_source_branch: event.branch_name,
|
||||
merge_request: {
|
||||
source_project_id: event.project.id,
|
||||
target_project_id: target_project.id,
|
||||
source_branch: event.branch_name,
|
||||
target_branch: target_project.repository.root_ref
|
||||
}
|
||||
}
|
||||
|
@ -51,10 +51,10 @@ module MergeRequestsHelper
|
|||
def mr_change_branches_path(merge_request)
|
||||
project_new_merge_request_path(
|
||||
@project,
|
||||
merge_request_source_branch: merge_request.source_branch,
|
||||
merge_request: {
|
||||
source_project_id: merge_request.source_project_id,
|
||||
target_project_id: merge_request.target_project_id,
|
||||
source_branch: merge_request.source_branch,
|
||||
target_branch: merge_request.target_branch
|
||||
},
|
||||
change_branches: true
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= @merge_request.inspect
|
||||
- if @merge_request.can_be_created
|
||||
= render "projects/diffs/diffs", diffs: @diffs, environment: @environment, show_whitespace_toggle: false
|
||||
- else
|
||||
|
|
|
@ -149,7 +149,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
|
|||
scope path: 'merge_requests', controller: 'merge_requests/creations' do
|
||||
post '', action: :create, as: nil
|
||||
|
||||
scope path: 'new', as: :new_merge_request do
|
||||
scope path: 'new/(:merge_request_source_branch)', as: :new_merge_request do
|
||||
scope constraints: { format: nil }, action: :new do
|
||||
get :diffs, defaults: { tab: 'diffs' }
|
||||
get :pipelines, defaults: { tab: 'pipelines' }
|
||||
|
|
|
@ -331,10 +331,10 @@ describe Projects::BlobController do
|
|||
expect(response).to redirect_to(
|
||||
project_new_merge_request_path(
|
||||
forked_project,
|
||||
merge_request_source_branch: "fork-test-1",
|
||||
merge_request: {
|
||||
source_project_id: forked_project.id,
|
||||
target_project_id: project.id,
|
||||
source_branch: "fork-test-1",
|
||||
target_branch: "master"
|
||||
}
|
||||
)
|
||||
|
|
|
@ -9,10 +9,10 @@ describe 'create a merge request, allowing commits from members who can merge to
|
|||
def visit_new_merge_request
|
||||
visit project_new_merge_request_path(
|
||||
source_project,
|
||||
merge_request_source_branch: 'fix',
|
||||
merge_request: {
|
||||
source_project_id: source_project.id,
|
||||
target_project_id: target_project.id,
|
||||
source_branch: 'fix',
|
||||
target_branch: 'master'
|
||||
})
|
||||
end
|
||||
|
|
|
@ -20,10 +20,10 @@ describe 'Merge request > User sees merge widget', :js do
|
|||
before do
|
||||
visit project_new_merge_request_path(
|
||||
project,
|
||||
merge_request_source_branch: 'feature',
|
||||
merge_request: {
|
||||
source_project_id: project.id,
|
||||
target_project_id: project.id,
|
||||
source_branch: 'feature',
|
||||
target_branch: 'master'
|
||||
})
|
||||
end
|
||||
|
|
|
@ -13,10 +13,10 @@ describe 'Merge request > User sees WIP help message' do
|
|||
it 'shows a specific WIP hint' do
|
||||
visit project_new_merge_request_path(
|
||||
project,
|
||||
merge_request_source_branch: 'wip',
|
||||
merge_request: {
|
||||
source_project_id: project.id,
|
||||
target_project_id: project.id,
|
||||
source_branch: 'wip',
|
||||
target_branch: 'master'
|
||||
})
|
||||
|
||||
|
@ -32,10 +32,10 @@ describe 'Merge request > User sees WIP help message' do
|
|||
it 'shows the regular WIP message' do
|
||||
visit project_new_merge_request_path(
|
||||
project,
|
||||
merge_request_source_branch: 'fix',
|
||||
merge_request: {
|
||||
source_project_id: project.id,
|
||||
target_project_id: project.id,
|
||||
source_branch: 'fix',
|
||||
target_branch: 'master'
|
||||
})
|
||||
|
||||
|
|
|
@ -109,13 +109,13 @@ describe 'Merge request > User selects branches for new MR', :js do
|
|||
end
|
||||
|
||||
it 'populates source branch button' do
|
||||
visit project_new_merge_request_path(project, change_branches: true, merge_request: { target_branch: 'master', source_branch: 'fix' })
|
||||
visit project_new_merge_request_path(project, change_branches: true, merge_request_source_branch: 'fix', merge_request: { target_branch: 'master' })
|
||||
|
||||
expect(find('.js-source-branch')).to have_content('fix')
|
||||
end
|
||||
|
||||
it 'allows to change the diff view' do
|
||||
visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: 'fix' })
|
||||
visit project_new_merge_request_path(project, merge_request_source_branch: 'fix', merge_request: { target_branch: 'master' })
|
||||
|
||||
click_link 'Changes'
|
||||
|
||||
|
@ -131,7 +131,7 @@ describe 'Merge request > User selects branches for new MR', :js do
|
|||
end
|
||||
|
||||
it 'does not allow non-existing branches' do
|
||||
visit project_new_merge_request_path(project, merge_request: { target_branch: 'non-exist-target', source_branch: 'non-exist-source' })
|
||||
visit project_new_merge_request_path(project, merge_request_source_branch: 'non-exist-source', merge_request: { target_branch: 'non-exist-target' })
|
||||
|
||||
expect(page).to have_content('The form contains the following errors')
|
||||
expect(page).to have_content('Source branch "non-exist-source" does not exist')
|
||||
|
@ -140,7 +140,7 @@ describe 'Merge request > User selects branches for new MR', :js do
|
|||
|
||||
context 'when a branch contains commits that both delete and add the same image' do
|
||||
it 'renders the diff successfully' do
|
||||
visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: 'deleted-image-test' })
|
||||
visit project_new_merge_request_path(project, merge_request_source_branch: 'deleted-image-test', merge_request: { target_branch: 'master' })
|
||||
|
||||
click_link "Changes"
|
||||
|
||||
|
@ -165,7 +165,8 @@ describe 'Merge request > User selects branches for new MR', :js do
|
|||
it 'shows pipelines for a new merge request' do
|
||||
visit project_new_merge_request_path(
|
||||
project,
|
||||
merge_request: { target_branch: 'master', source_branch: 'fix' })
|
||||
merge_request_source_branch: 'fix',
|
||||
merge_request: { target_branch: 'master' })
|
||||
|
||||
page.within('.merge-request') do
|
||||
click_link 'Pipelines'
|
||||
|
|
|
@ -144,7 +144,7 @@ describe 'Merge request > User uses quick actions', :js do
|
|||
|
||||
describe '/target_branch command in merge request' do
|
||||
let(:another_project) { create(:project, :public, :repository) }
|
||||
let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }
|
||||
let(:new_url_opts) { { merge_request_source_branch: 'feature' } }
|
||||
|
||||
before do
|
||||
another_project.add_maintainer(user)
|
||||
|
|
|
@ -65,7 +65,7 @@ describe 'User squashes a merge request', :js do
|
|||
|
||||
context 'when squash is enabled on merge request creation' do
|
||||
before do
|
||||
visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch })
|
||||
visit project_new_merge_request_path(project, merge_request_source_branch: source_branch, merge_request: { target_branch: 'master' })
|
||||
check 'merge_request[squash]'
|
||||
click_on 'Submit merge request'
|
||||
wait_for_requests
|
||||
|
@ -95,7 +95,7 @@ describe 'User squashes a merge request', :js do
|
|||
|
||||
context 'when squash is not enabled on merge request creation' do
|
||||
before do
|
||||
visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch })
|
||||
visit project_new_merge_request_path(project, merge_request_source_branch: source_branch, merge_request: { target_branch: 'master' })
|
||||
click_on 'Submit merge request'
|
||||
wait_for_requests
|
||||
end
|
||||
|
|
|
@ -22,8 +22,8 @@ describe 'Merge Request button' do
|
|||
|
||||
it 'shows Create merge request button' do
|
||||
href = project_new_merge_request_path(project,
|
||||
merge_request: { source_branch: 'feature',
|
||||
target_branch: 'master' })
|
||||
merge_request_source_branch: 'feature',
|
||||
merge_request: { target_branch: 'master' })
|
||||
|
||||
visit url
|
||||
|
||||
|
@ -77,8 +77,8 @@ describe 'Merge Request button' do
|
|||
|
||||
it 'shows Create merge request button' do
|
||||
href = project_new_merge_request_path(forked_project,
|
||||
merge_request: { source_branch: 'feature',
|
||||
target_branch: 'master' })
|
||||
merge_request_source_branch: 'feature',
|
||||
merge_request: { target_branch: 'master' })
|
||||
|
||||
visit fork_url
|
||||
|
||||
|
|
|
@ -17,10 +17,10 @@ RSpec.shared_examples 'a creatable merge request' do
|
|||
sign_in(user)
|
||||
visit project_new_merge_request_path(
|
||||
target_project,
|
||||
merge_request_source_branch: 'fix',
|
||||
merge_request: {
|
||||
source_project_id: source_project.id,
|
||||
target_project_id: target_project.id,
|
||||
source_branch: 'fix',
|
||||
target_branch: 'master'
|
||||
})
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue