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
f14c5ae8
Commit
f14c5ae8
authored
Oct 25, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor MergeRequestTabs to es6 class syntax
parent
ac0d9b34
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
88 additions
and
91 deletions
+88
-91
app/assets/javascripts/merge_request.js
app/assets/javascripts/merge_request.js
+1
-1
app/assets/javascripts/merge_request_tabs.js.es6
app/assets/javascripts/merge_request_tabs.js.es6
+86
-89
spec/javascripts/merge_request_tabs_spec.js
spec/javascripts/merge_request_tabs_spec.js
+1
-1
No files found.
app/assets/javascripts/merge_request.js
View file @
f14c5ae8
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
if
(
window
.
mrTabs
)
{
if
(
window
.
mrTabs
)
{
window
.
mrTabs
.
unbindEvents
();
window
.
mrTabs
.
unbindEvents
();
}
}
window
.
mrTabs
=
new
MergeRequestTabs
(
this
.
opts
);
window
.
mrTabs
=
new
gl
.
MergeRequestTabs
(
this
.
opts
);
};
};
MergeRequest
.
prototype
.
showAllCommits
=
function
()
{
MergeRequest
.
prototype
.
showAllCommits
=
function
()
{
...
...
app/assets/javascripts/merge_request_tabs.js
→
app/assets/javascripts/merge_request_tabs.js
.es6
View file @
f14c5ae8
This diff is collapsed.
Click to expand it.
spec/javascripts/merge_request_tabs_spec.js
View file @
f14c5ae8
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
};
};
fixture
.
preload
(
'
merge_request_tabs.html
'
);
fixture
.
preload
(
'
merge_request_tabs.html
'
);
beforeEach
(
function
()
{
beforeEach
(
function
()
{
this
[
"
class
"
]
=
new
MergeRequestTabs
();
this
[
"
class
"
]
=
new
gl
.
MergeRequestTabs
();
return
this
.
spies
=
{
return
this
.
spies
=
{
ajax
:
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{}),
ajax
:
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{}),
history
:
spyOn
(
history
,
'
replaceState
'
).
and
.
callFake
(
function
()
{})
history
:
spyOn
(
history
,
'
replaceState
'
).
and
.
callFake
(
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