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
Jérome Perrin
gitlab-ce
Commits
93374066
Commit
93374066
authored
Mar 17, 2016
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
Spinach was right, I was a fool..
parent
481e73fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/models/issue.rb
app/models/issue.rb
+1
-0
spec/features/issues/new_branch_button_spec.rb
spec/features/issues/new_branch_button_spec.rb
+1
-1
No files found.
app/models/issue.rb
View file @
93374066
...
@@ -98,6 +98,7 @@ class Issue < ActiveRecord::Base
...
@@ -98,6 +98,7 @@ class Issue < ActiveRecord::Base
end
end
def
related_branches
def
related_branches
return
[]
if
self
.
project
.
empty_repo?
self
.
project
.
repository
.
branch_names
.
select
do
|
branch
|
self
.
project
.
repository
.
branch_names
.
select
do
|
branch
|
branch
=~
/\A
#{
iid
}
-(?!\d+-stable)/i
branch
=~
/\A
#{
iid
}
-(?!\d+-stable)/i
end
end
...
...
spec/features/issues/new_branch_button_spec.rb
View file @
93374066
...
@@ -24,7 +24,7 @@ feature 'Start new branch from an issue', feature: true do
...
@@ -24,7 +24,7 @@ feature 'Start new branch from an issue', feature: true do
end
end
let
(
:referenced_mr
)
do
let
(
:referenced_mr
)
do
create
(
:merge_request
,
:simple
,
source_project:
project
,
target_project:
project
,
create
(
:merge_request
,
:simple
,
source_project:
project
,
target_project:
project
,
description:
"Fixes #
#{
issue
.
iid
}
"
)
description:
"Fixes #
#{
issue
.
iid
}
"
)
end
end
before
do
before
do
...
...
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