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
abccc8c7
Commit
abccc8c7
authored
May 18, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve a forgotten conflict
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
ad2f0fe9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
spec/javascripts/gl_dropdown_spec.js
spec/javascripts/gl_dropdown_spec.js
+0
-3
No files found.
spec/javascripts/gl_dropdown_spec.js
View file @
abccc8c7
...
...
@@ -89,8 +89,6 @@ require('~/lib/utils/url_utility');
).
toBe
(
'
<script>alert("testing");</script>
'
);
});
<<<<<<<
HEAD
=======
it
(
'
should output HTML when highlighting
'
,
()
=>
{
this
.
projectsData
[
0
].
name_with_namespace
=
'
testing
'
;
$
(
'
.dropdown-input .dropdown-input-field
'
).
val
(
'
test
'
);
...
...
@@ -110,7 +108,6 @@ require('~/lib/utils/url_utility');
).
toBe
(
'
<b>t</b><b>e</b><b>s</b><b>t</b>ing
'
);
});
>>>>>>>
upstream
/
master
describe
(
'
that is open
'
,
()
=>
{
beforeEach
(()
=>
{
initDropDown
.
call
(
this
,
false
,
false
);
...
...
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