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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
ad97bebf
Commit
ad97bebf
authored
Feb 17, 2016
by
Zeger-Jan van de Weg
Committed by
Zeger-Jan van de Weg
Mar 15, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enhance new branch button on an issue
parent
228007df
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
99 additions
and
50 deletions
+99
-50
app/controllers/projects/branches_controller.rb
app/controllers/projects/branches_controller.rb
+6
-0
app/models/issue.rb
app/models/issue.rb
+6
-5
app/services/merge_requests/build_service.rb
app/services/merge_requests/build_service.rb
+8
-4
app/services/system_note_service.rb
app/services/system_note_service.rb
+9
-0
app/views/projects/issues/_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+2
-2
spec/controllers/projects/branches_controller_spec.rb
spec/controllers/projects/branches_controller_spec.rb
+56
-35
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+0
-4
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+12
-0
No files found.
app/controllers/projects/branches_controller.rb
View file @
ad97bebf
...
@@ -27,6 +27,12 @@ class Projects::BranchesController < Projects::ApplicationController
...
@@ -27,6 +27,12 @@ class Projects::BranchesController < Projects::ApplicationController
result
=
CreateBranchService
.
new
(
project
,
current_user
).
result
=
CreateBranchService
.
new
(
project
,
current_user
).
execute
(
branch_name
,
ref
)
execute
(
branch_name
,
ref
)
if
params
[
:issue_id
]
issue
=
Issue
.
where
(
id:
params
[
:issue_id
],
project:
@project
).
limit
(
1
).
first
SystemNoteService
.
new_issue_branch
(
issue
,
@project
,
current_user
,
branch_name
)
end
if
result
[
:status
]
==
:success
if
result
[
:status
]
==
:success
@branch
=
result
[
:branch
]
@branch
=
result
[
:branch
]
redirect_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
redirect_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
...
...
app/models/issue.rb
View file @
ad97bebf
...
@@ -95,7 +95,7 @@ class Issue < ActiveRecord::Base
...
@@ -95,7 +95,7 @@ class Issue < ActiveRecord::Base
end
end
def
related_branches
def
related_branches
self
.
project
.
repository
.
branch_names
.
select
{
|
branch
|
/\A
#{
iid
}
-/
=~
branch
}
self
.
project
.
repository
.
branch_names
.
select
{
|
branch
|
branch
.
start_with?
"
#{
iid
}
-"
}
end
end
# Reset issue events cache
# Reset issue events cache
...
@@ -126,12 +126,13 @@ class Issue < ActiveRecord::Base
...
@@ -126,12 +126,13 @@ class Issue < ActiveRecord::Base
end
end
def
to_branch_name
def
to_branch_name
"
#{
iid
}
-
#{
title
.
parameterize
}
"
[
0
,
25
]
"
#{
iid
}
-
#{
title
.
parameterize
}
"
end
end
def
new_branch_butt
on?
(
current_user
)
def
can_be_worked_
on?
(
current_user
)
!
self
.
closed?
&&
!
self
.
closed?
&&
referenced_merge_requests
(
current_user
).
empty?
&&
!
self
.
project
.
forked?
&&
referenced_merge_requests
(
current_user
).
none?
{
|
mr
|
mr
.
closes_issue?
(
self
)
}
&&
related_branches
.
empty?
related_branches
.
empty?
end
end
end
end
app/services/merge_requests/build_service.rb
View file @
ad97bebf
...
@@ -51,11 +51,15 @@ module MergeRequests
...
@@ -51,11 +51,15 @@ module MergeRequests
# be interpreted as the use wants to close that issue on this project
# be interpreted as the use wants to close that issue on this project
# Pattern example: 112-fix-mep-mep
# Pattern example: 112-fix-mep-mep
# Will lead to appending `Closes #112` to the description
# Will lead to appending `Closes #112` to the description
if
m
erge_request
.
source_branch
=~
/\A\d+-/
if
m
atch
=
merge_request
.
source_branch
.
match
(
/\A(\d+)-/
)
closes_issue
=
"Closes #
#{
Regexp
.
last_match
(
0
)[
0
...-
1
]
}
"
iid
=
match
[
1
]
closes_issue
.
prepend
(
"
\n
"
)
if
merge_request
.
description
.
present?
closes_issue
=
"Closes #
#{
iid
}
"
merge_request
.
description
<<
closes_issue
if
merge_request
.
description
.
present?
merge_request
.
description
<<
closes_issue
.
prepend
(
"
\n
"
)
else
merge_request
.
description
=
closes_issue
end
end
end
merge_request
merge_request
...
...
app/services/system_note_service.rb
View file @
ad97bebf
...
@@ -207,6 +207,15 @@ class SystemNoteService
...
@@ -207,6 +207,15 @@ class SystemNoteService
create_note
(
noteable:
noteable
,
project:
project
,
author:
author
,
note:
body
)
create_note
(
noteable:
noteable
,
project:
project
,
author:
author
,
note:
body
)
end
end
# Called when a branch is created from the 'new branch' button on a issue
# Example note text:
#
# "Started branch `201-issue-branch-button`"
def
self
.
new_issue_branch
(
issue
,
project
,
author
,
branch
)
body
=
"Started branch `
#{
branch
}
`"
create_note
(
noteable:
issue
,
project:
project
,
author:
author
,
note:
body
)
end
# Called when a Mentionable references a Noteable
# Called when a Mentionable references a Noteable
#
#
# noteable - Noteable object being referenced
# noteable - Noteable object being referenced
...
...
app/views/projects/issues/_new_branch.html.haml
View file @
ad97bebf
-
if
current_user
&&
can?
(
current_user
,
:push_code
,
@project
)
&&
@issue
.
new_branch_butt
on?
(
current_user
)
-
if
current_user
&&
can?
(
current_user
,
:push_code
,
@project
)
&&
@issue
.
can_be_worked_
on?
(
current_user
)
.pull-right
.pull-right
=
link_to
namespace_project_branches_path
(
@project
.
namespace
,
@project
,
branch_name:
@issue
.
to_branch_name
),
method: :post
,
class:
'btn'
do
=
link_to
namespace_project_branches_path
(
@project
.
namespace
,
@project
,
branch_name:
@issue
.
to_branch_name
,
issue_id:
@issue
.
id
),
method: :post
,
class:
'btn'
,
title:
@issue
.
to_branch_name
do
=
icon
(
'code-fork'
)
=
icon
(
'code-fork'
)
New Branch
New Branch
spec/controllers/projects/branches_controller_spec.rb
View file @
ad97bebf
...
@@ -17,6 +17,7 @@ describe Projects::BranchesController do
...
@@ -17,6 +17,7 @@ describe Projects::BranchesController do
describe
"POST create"
do
describe
"POST create"
do
render_views
render_views
context
"on creation of a new branch"
do
before
do
before
do
post
:create
,
post
:create
,
namespace_id:
project
.
namespace
.
to_param
,
namespace_id:
project
.
namespace
.
to_param
,
...
@@ -59,7 +60,27 @@ describe Projects::BranchesController do
...
@@ -59,7 +60,27 @@ describe Projects::BranchesController do
let
(
:branch
)
{
"feature%2Ftest"
}
let
(
:branch
)
{
"feature%2Ftest"
}
let
(
:ref
)
{
"<script>alert('ref');</script>"
}
let
(
:ref
)
{
"<script>alert('ref');</script>"
}
it
{
is_expected
.
to
render_template
(
'new'
)
}
it
{
is_expected
.
to
render_template
(
'new'
)
}
it
{
project
.
repository
.
branch_names
.
include?
(
'feature/test'
)}
it
{
project
.
repository
.
branch_names
.
include?
(
'feature/test'
)
}
end
end
describe
"created from the new branch button on issues"
do
let
(
:branch
)
{
"1-feature-branch"
}
let!
(
:issue
)
{
create
(
:issue
)
}
before
do
post
:create
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
branch_name:
branch
,
issue_id:
issue
.
id
end
it
'redirects'
do
expect
(
subject
).
to
redirect_to
(
"/
#{
project
.
path_with_namespace
}
/tree/1-feature-branch"
)
end
end
end
end
end
...
...
spec/models/issue_spec.rb
View file @
ad97bebf
...
@@ -144,10 +144,6 @@ describe Issue, models: true do
...
@@ -144,10 +144,6 @@ describe Issue, models: true do
describe
"#to_branch_name"
do
describe
"#to_branch_name"
do
let
(
:issue
)
{
build
(
:issue
,
title:
'a'
*
30
)
}
let
(
:issue
)
{
build
(
:issue
,
title:
'a'
*
30
)
}
it
"is expected not to exceed 25 chars"
do
expect
(
issue
.
to_branch_name
.
length
).
to
eq
25
end
it
"starts with the issue iid"
do
it
"starts with the issue iid"
do
expect
(
issue
.
to_branch_name
).
to
match
/\A
#{
issue
.
iid
}
-a+\z/
expect
(
issue
.
to_branch_name
).
to
match
/\A
#{
issue
.
iid
}
-a+\z/
end
end
...
...
spec/services/system_note_service_spec.rb
View file @
ad97bebf
...
@@ -280,6 +280,18 @@ describe SystemNoteService, services: true do
...
@@ -280,6 +280,18 @@ describe SystemNoteService, services: true do
end
end
end
end
describe
'.new_issue_branch'
do
subject
{
described_class
.
new_issue_branch
(
noteable
,
project
,
author
,
"1-mepmep"
)
}
it_behaves_like
'a system note'
context
'when a branch is created from the new branch button'
do
it
'sets the note text'
do
expect
(
subject
.
note
).
to
eq
'Started branch 1-mepmep'
end
end
end
describe
'.cross_reference'
do
describe
'.cross_reference'
do
subject
{
described_class
.
cross_reference
(
noteable
,
mentioner
,
author
)
}
subject
{
described_class
.
cross_reference
(
noteable
,
mentioner
,
author
)
}
...
...
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