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
535fa7d8
Commit
535fa7d8
authored
Dec 30, 2016
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-boards-search-typo' into 'master'
Fix boards search typo See merge request !8370
parents
f9a49d09
091d21d5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
app/assets/javascripts/boards/boards_bundle.js.es6
app/assets/javascripts/boards/boards_bundle.js.es6
+1
-1
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+1
-1
changelogs/unreleased/fix-boards-search-typo.yml
changelogs/unreleased/fix-boards-search-typo.yml
+4
-0
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+3
-3
No files found.
app/assets/javascripts/boards/boards_bundle.js.es6
View file @
535fa7d8
...
@@ -73,7 +73,7 @@ $(() => {
...
@@ -73,7 +73,7 @@ $(() => {
});
});
gl.IssueBoardsSearch = new Vue({
gl.IssueBoardsSearch = new Vue({
el: '#js-boards-seach',
el: '#js-boards-sea
r
ch',
data: {
data: {
filters: Store.state.filters
filters: Store.state.filters
},
},
...
...
app/views/shared/issuable/_filter.html.haml
View file @
535fa7d8
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
.pull-right
.pull-right
-
if
boards_page
-
if
boards_page
#js-boards-seach
.issue-boards-search
#js-boards-sea
r
ch
.issue-boards-search
%input
.pull-left.form-control
{
type:
"search"
,
placeholder:
"Filter by name..."
,
"v-model"
=>
"filters.search"
,
"debounce"
=>
"250"
}
%input
.pull-left.form-control
{
type:
"search"
,
placeholder:
"Filter by name..."
,
"v-model"
=>
"filters.search"
,
"debounce"
=>
"250"
}
-
if
can?
(
current_user
,
:admin_list
,
@project
)
-
if
can?
(
current_user
,
:admin_list
,
@project
)
.dropdown.pull-right
.dropdown.pull-right
...
...
changelogs/unreleased/fix-boards-search-typo.yml
0 → 100644
View file @
535fa7d8
---
title
:
'
Fix
typo:
seach
to
search'
merge_request
:
8370
author
:
spec/features/boards/boards_spec.rb
View file @
535fa7d8
...
@@ -109,7 +109,7 @@ describe 'Issue Boards', feature: true, js: true do
...
@@ -109,7 +109,7 @@ describe 'Issue Boards', feature: true, js: true do
end
end
it
'search backlog list'
do
it
'search backlog list'
do
page
.
within
(
'#js-boards-seach'
)
do
page
.
within
(
'#js-boards-sea
r
ch'
)
do
find
(
'.form-control'
).
set
(
issue1
.
title
)
find
(
'.form-control'
).
set
(
issue1
.
title
)
end
end
...
@@ -122,7 +122,7 @@ describe 'Issue Boards', feature: true, js: true do
...
@@ -122,7 +122,7 @@ describe 'Issue Boards', feature: true, js: true do
end
end
it
'search done list'
do
it
'search done list'
do
page
.
within
(
'#js-boards-seach'
)
do
page
.
within
(
'#js-boards-sea
r
ch'
)
do
find
(
'.form-control'
).
set
(
issue8
.
title
)
find
(
'.form-control'
).
set
(
issue8
.
title
)
end
end
...
@@ -135,7 +135,7 @@ describe 'Issue Boards', feature: true, js: true do
...
@@ -135,7 +135,7 @@ describe 'Issue Boards', feature: true, js: true do
end
end
it
'search list'
do
it
'search list'
do
page
.
within
(
'#js-boards-seach'
)
do
page
.
within
(
'#js-boards-sea
r
ch'
)
do
find
(
'.form-control'
).
set
(
issue5
.
title
)
find
(
'.form-control'
).
set
(
issue5
.
title
)
end
end
...
...
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