Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' into 'master'
Ensure group acts as a namespace for polymorphic routes Closes #26810 See merge request !8627
This commit is contained in:
commit
4b999ccd57
|
@ -13,7 +13,7 @@
|
||||||
%a.close{ href: "#", "data-dismiss" => "modal" } ×
|
%a.close{ href: "#", "data-dismiss" => "modal" } ×
|
||||||
%h3.page-title== #{label} this #{commit.change_type_title(current_user)}
|
%h3.page-title== #{label} this #{commit.change_type_title(current_user)}
|
||||||
.modal-body
|
.modal-body
|
||||||
= form_tag [type.underscore, @project.namespace, @project, commit], method: :post, remote: false, class: "form-horizontal js-#{type}-form js-requires-input" do
|
= form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "form-horizontal js-#{type}-form js-requires-input" do
|
||||||
.form-group.branch
|
.form-group.branch
|
||||||
= label_tag 'target_branch', target_label, class: 'control-label'
|
= label_tag 'target_branch', target_label, class: 'control-label'
|
||||||
.col-sm-10
|
.col-sm-10
|
||||||
|
|
|
@ -2,7 +2,8 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'Cherry-pick Merge Requests' do
|
describe 'Cherry-pick Merge Requests' do
|
||||||
let(:user) { create(:user) }
|
let(:user) { create(:user) }
|
||||||
let(:project) { create(:project) }
|
let(:group) { create(:group) }
|
||||||
|
let(:project) { create(:project, namespace: group) }
|
||||||
let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) }
|
let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
|
|
@ -2,7 +2,8 @@ require 'spec_helper'
|
||||||
include WaitForAjax
|
include WaitForAjax
|
||||||
|
|
||||||
describe 'Cherry-pick Commits' do
|
describe 'Cherry-pick Commits' do
|
||||||
let(:project) { create(:project) }
|
let(:group) { create(:group) }
|
||||||
|
let(:project) { create(:project, namespace: group) }
|
||||||
let(:master_pickable_commit) { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
|
let(:master_pickable_commit) { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
|
||||||
let(:master_pickable_merge) { project.commit('e56497bb5f03a90a51293fc6d516788730953899') }
|
let(:master_pickable_merge) { project.commit('e56497bb5f03a90a51293fc6d516788730953899') }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue