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
3babc959
Commit
3babc959
authored
Aug 02, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests.
parent
0bfef4bd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/projects/branches_controller.rb
app/controllers/projects/branches_controller.rb
+1
-1
spec/features/projects/branches_spec.rb
spec/features/projects/branches_spec.rb
+1
-1
No files found.
app/controllers/projects/branches_controller.rb
View file @
3babc959
...
@@ -19,7 +19,7 @@ class Projects::BranchesController < Projects::ApplicationController
...
@@ -19,7 +19,7 @@ class Projects::BranchesController < Projects::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
json
do
format
.
json
do
render
json:
@repository
.
branch_names
.
to_json
render
json:
@repository
.
branch_names
end
end
end
end
end
end
...
...
spec/features/projects/branches_spec.rb
View file @
3babc959
...
@@ -20,7 +20,7 @@ describe 'Branches', feature: true do
...
@@ -20,7 +20,7 @@ describe 'Branches', feature: true do
describe
'Find branches'
do
describe
'Find branches'
do
it
'shows filtered branches'
,
js:
true
do
it
'shows filtered branches'
,
js:
true
do
visit
namespace_project_branches_path
(
project
.
namespace
,
project
,
project
.
id
)
visit
namespace_project_branches_path
(
project
.
namespace
,
project
)
fill_in
'branch-search'
,
with:
'fix'
fill_in
'branch-search'
,
with:
'fix'
find
(
'#branch-search'
).
native
.
send_keys
(
:enter
)
find
(
'#branch-search'
).
native
.
send_keys
(
:enter
)
...
...
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