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
953b4b78
Commit
953b4b78
authored
May 25, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts in JS specs
parent
d0c4ee4a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
0 additions
and
27 deletions
+0
-27
spec/javascripts/blob/create_branch_dropdown_spec.js
spec/javascripts/blob/create_branch_dropdown_spec.js
+0
-4
spec/javascripts/blob/target_branch_dropdown_spec.js
spec/javascripts/blob/target_branch_dropdown_spec.js
+0
-4
spec/javascripts/gfm_auto_complete_spec.js
spec/javascripts/gfm_auto_complete_spec.js
+0
-3
spec/javascripts/gl_dropdown_spec.js
spec/javascripts/gl_dropdown_spec.js
+0
-4
spec/javascripts/labels_issue_sidebar_spec.js
spec/javascripts/labels_issue_sidebar_spec.js
+0
-4
spec/javascripts/project_title_spec.js
spec/javascripts/project_title_spec.js
+0
-4
spec/javascripts/search_autocomplete_spec.js
spec/javascripts/search_autocomplete_spec.js
+0
-4
No files found.
spec/javascripts/blob/create_branch_dropdown_spec.js
View file @
953b4b78
import
'
~/gl_dropdown
'
;
import
'
~/gl_dropdown
'
;
<<<<<<<
HEAD
import
'
~/lib/utils/type_utility
'
;
=======
>>>>>>>
ce
/
master
import
'
~/blob/create_branch_dropdown
'
;
import
'
~/blob/create_branch_dropdown
'
;
import
'
~/blob/target_branch_dropdown
'
;
import
'
~/blob/target_branch_dropdown
'
;
...
...
spec/javascripts/blob/target_branch_dropdown_spec.js
View file @
953b4b78
import
'
~/gl_dropdown
'
;
import
'
~/gl_dropdown
'
;
<<<<<<<
HEAD
import
'
~/lib/utils/type_utility
'
;
=======
>>>>>>>
ce
/
master
import
'
~/blob/create_branch_dropdown
'
;
import
'
~/blob/create_branch_dropdown
'
;
import
'
~/blob/target_branch_dropdown
'
;
import
'
~/blob/target_branch_dropdown
'
;
...
...
spec/javascripts/gfm_auto_complete_spec.js
View file @
953b4b78
/* eslint no-param-reassign: "off" */
/* eslint no-param-reassign: "off" */
import
GfmAutoComplete
from
'
~/gfm_auto_complete
'
;
import
GfmAutoComplete
from
'
~/gfm_auto_complete
'
;
<<<<<<<
HEAD
=======
>>>>>>>
ce
/
master
import
'
vendor/jquery.caret
'
;
import
'
vendor/jquery.caret
'
;
import
'
vendor/jquery.atwho
'
;
import
'
vendor/jquery.atwho
'
;
...
...
spec/javascripts/gl_dropdown_spec.js
View file @
953b4b78
...
@@ -2,10 +2,6 @@
...
@@ -2,10 +2,6 @@
import
'
~/gl_dropdown
'
;
import
'
~/gl_dropdown
'
;
import
'
~/lib/utils/common_utils
'
;
import
'
~/lib/utils/common_utils
'
;
<<<<<<<
HEAD
import
'
~/lib/utils/type_utility
'
;
=======
>>>>>>>
ce
/
master
import
'
~/lib/utils/url_utility
'
;
import
'
~/lib/utils/url_utility
'
;
(()
=>
{
(()
=>
{
...
...
spec/javascripts/labels_issue_sidebar_spec.js
View file @
953b4b78
...
@@ -2,10 +2,6 @@
...
@@ -2,10 +2,6 @@
/* global IssuableContext */
/* global IssuableContext */
/* global LabelsSelect */
/* global LabelsSelect */
<<<<<<<
HEAD
import
'
~/lib/utils/type_utility
'
;
=======
>>>>>>>
ce
/
master
import
'
~/gl_dropdown
'
;
import
'
~/gl_dropdown
'
;
import
'
select2
'
;
import
'
select2
'
;
import
'
vendor/jquery.nicescroll
'
;
import
'
vendor/jquery.nicescroll
'
;
...
...
spec/javascripts/project_title_spec.js
View file @
953b4b78
...
@@ -2,10 +2,6 @@
...
@@ -2,10 +2,6 @@
/* global Project */
/* global Project */
import
'
select2/select2
'
;
import
'
select2/select2
'
;
<<<<<<<
HEAD
import
'
~/lib/utils/type_utility
'
;
=======
>>>>>>>
ce
/
master
import
'
~/gl_dropdown
'
;
import
'
~/gl_dropdown
'
;
import
'
~/api
'
;
import
'
~/api
'
;
import
'
~/project_select
'
;
import
'
~/project_select
'
;
...
...
spec/javascripts/search_autocomplete_spec.js
View file @
953b4b78
...
@@ -3,10 +3,6 @@
...
@@ -3,10 +3,6 @@
import
'
~/gl_dropdown
'
;
import
'
~/gl_dropdown
'
;
import
'
~/search_autocomplete
'
;
import
'
~/search_autocomplete
'
;
import
'
~/lib/utils/common_utils
'
;
import
'
~/lib/utils/common_utils
'
;
<<<<<<<
HEAD
import
'
~/lib/utils/type_utility
'
;
=======
>>>>>>>
ce
/
master
import
'
vendor/fuzzaldrin-plus
'
;
import
'
vendor/fuzzaldrin-plus
'
;
(
function
()
{
(
function
()
{
...
...
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