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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
737a62f6
Commit
737a62f6
authored
Sep 14, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in index.js
parent
49c7d35c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
10 deletions
+2
-10
app/assets/javascripts/pages/groups/issues/index.js
app/assets/javascripts/pages/groups/issues/index.js
+2
-10
No files found.
app/assets/javascripts/pages/groups/issues/index.js
View file @
737a62f6
import
projectSelect
from
'
~/project_select
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
<<<<<<<
HEAD
import
IssuesFilteredSearchTokenKeysEE
from
'
ee/filtered_search/issues_filtered_search_token_keys
'
;
=======
import
IssuableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable_filtered_search_token_keys
'
;
>>>>>>>
upstream
/
master
import
IssuableFilteredSearchTokenKeysEE
from
'
ee/filtered_search/issuable_filtered_search_token_keys
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initFilteredSearch
({
page
:
FILTERED_SEARCH
.
ISSUES
,
isGroupDecendent
:
true
,
<<<<<<<
HEAD
filteredSearchTokenKeys
:
IssuesFilteredSearchTokenKeysEE
,
=======
filteredSearchTokenKeys
:
IssuableFilteredSearchTokenKeys
,
>>>>>>>
upstream
/
master
filteredSearchTokenKeys
:
IssuableFilteredSearchTokenKeysEE
,
});
projectSelect
();
});
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