BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2da8b5dc
Commit
2da8b5dc
authored
Mar 16, 2017
by
Alfredo Sumaran
Committed by
Lin Jen-Shin
Mar 17, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'compare-remote-search' into 'master'
Enabled remote filter in compare dropdowns Closes #29545 See merge request !9997
parent
e6766053
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
compare_autocomplete.js
app/assets/javascripts/compare_autocomplete.js
+3
-2
compare_spec.rb
spec/features/projects/compare_spec.rb
+8
-0
No files found.
app/assets/javascripts/compare_autocomplete.js
View file @
2da8b5dc
...
...
@@ -19,7 +19,8 @@
return
$
.
ajax
({
url
:
$dropdown
.
data
(
'refs-url'
),
data
:
{
ref
:
$dropdown
.
data
(
'ref'
)
ref
:
$dropdown
.
data
(
'ref'
),
search
:
term
,
}
}).
done
(
function
(
refs
)
{
return
callback
(
refs
);
...
...
@@ -27,7 +28,7 @@
},
selectable
:
true
,
filterable
:
true
,
filter
ByText
:
true
,
filter
Remote
:
true
,
fieldName
:
$dropdown
.
data
(
'field-name'
),
filterInput
:
'input[type="search"]'
,
renderRow
:
function
(
ref
)
{
...
...
spec/features/projects/compare_spec.rb
View file @
2da8b5dc
...
...
@@ -26,6 +26,14 @@ describe "Compare", js: true do
click_button
"Compare"
expect
(
page
).
to
have_content
"Commits"
end
it
"filters branches"
do
select_using_dropdown
(
"from"
,
"wip"
)
find
(
".js-compare-from-dropdown .compare-dropdown-toggle"
).
click
expect
(
find
(
".js-compare-from-dropdown .dropdown-content"
)).
to
have_selector
(
"li"
,
count:
3
)
end
end
describe
"tags"
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