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
1c9ee90e
Commit
1c9ee90e
authored
Apr 04, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in app/assets/javascripts/pages/groups/issues/index.js
parent
f65684f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
app/assets/javascripts/pages/groups/issues/index.js
app/assets/javascripts/pages/groups/issues/index.js
+0
-3
No files found.
app/assets/javascripts/pages/groups/issues/index.js
View file @
1c9ee90e
...
@@ -6,10 +6,7 @@ import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_to
...
@@ -6,10 +6,7 @@ import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_to
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initFilteredSearch
({
initFilteredSearch
({
page
:
FILTERED_SEARCH
.
ISSUES
,
page
:
FILTERED_SEARCH
.
ISSUES
,
<<<<<<<
HEAD
filteredSearchTokenKeys
:
FilteredSearchTokenKeysIssues
,
filteredSearchTokenKeys
:
FilteredSearchTokenKeysIssues
,
=======
>>>>>>>
upstream
/
master
isGroupDecendent
:
true
,
isGroupDecendent
:
true
,
});
});
projectSelect
();
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