Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f7eb3573
Commit
f7eb3573
authored
Jan 18, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure group acts as a namespace for polymorphic routes
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
5e9196b3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
app/views/projects/commit/_change.html.haml
app/views/projects/commit/_change.html.haml
+1
-1
spec/features/merge_requests/cherry_pick_spec.rb
spec/features/merge_requests/cherry_pick_spec.rb
+2
-1
spec/features/projects/commits/cherry_pick_spec.rb
spec/features/projects/commits/cherry_pick_spec.rb
+2
-1
No files found.
app/views/projects/commit/_change.html.haml
View file @
f7eb3573
...
@@ -13,7 +13,7 @@
...
@@ -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
...
...
spec/features/merge_requests/cherry_pick_spec.rb
View file @
f7eb3573
...
@@ -2,7 +2,8 @@ require 'spec_helper'
...
@@ -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
...
...
spec/features/projects/commits/cherry_pick_spec.rb
View file @
f7eb3573
...
@@ -2,7 +2,8 @@ require 'spec_helper'
...
@@ -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'
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment