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
Tatuya Kamada
gitlab-ce
Commits
913857e5
Commit
913857e5
authored
8 years ago
by
Jared Deckard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Require comments must be included before code
parent
7f6474b2
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+0
-3
spec/javascripts/spec_helper.js
spec/javascripts/spec_helper.js
+5
-5
No files found.
app/assets/javascripts/merge_request_tabs.js
View file @
913857e5
...
...
@@ -264,7 +264,6 @@
});
};
<<<<<<<
a79ff9346b73079148cc4ecc81da82804bb51f3c
MergeRequestTabs
.
prototype
.
loadPipelines
=
function
(
source
)
{
if
(
this
.
pipelinesLoaded
)
{
return
;
...
...
@@ -280,11 +279,9 @@
});
};
=======
// Show or hide the loading spinner
//
// status - Boolean, true to show, false to hide
>>>>>>>
Restore
comments
lost
when
converting
CoffeeScript
to
JavaScript
MergeRequestTabs
.
prototype
.
toggleLoading
=
function
(
status
)
{
return
$
(
'
.mr-loading-status .loading
'
).
toggle
(
status
);
};
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/spec_helper.js
View file @
913857e5
(
function
()
{
}).
call
(
this
);
// PhantomJS (Teaspoons default driver) doesn't have support for
// Function.prototype.bind, which has caused confusion. Use this polyfill to
// avoid the confusion.
...
...
@@ -40,3 +35,8 @@
// instance) you can disable the suite matcher in the configuration and use this
// file as a manifest.
// For more information: http://github.com/modeset/teaspoon
(
function
()
{
}).
call
(
this
);
This diff is collapsed.
Click to expand it.
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