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
Jérome Perrin
gitlab-ce
Commits
0d53e97e
Commit
0d53e97e
authored
Dec 03, 2016
by
Steffen Rauh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Satisfied eslint
parent
0966c6d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/merge_request_tabs.js.es6
app/assets/javascripts/merge_request_tabs.js.es6
+1
-1
spec/javascripts/merge_request_tabs_spec.js
spec/javascripts/merge_request_tabs_spec.js
+5
-5
No files found.
app/assets/javascripts/merge_request_tabs.js.es6
View file @
0d53e97e
...
@@ -225,7 +225,7 @@
...
@@ -225,7 +225,7 @@
// We extract pathname for the current Changes tab anchor href
// We extract pathname for the current Changes tab anchor href
// some pages like MergeRequestsController#new has query parameters on that anchor
// some pages like MergeRequestsController#new has query parameters on that anchor
var
urlPathname = gl.utils.parseUrlPathname(source);
const
urlPathname = gl.utils.parseUrlPathname(source);
this.ajaxGet({
this.ajaxGet({
url: `${urlPathname}.json${location.search}`,
url: `${urlPathname}.json${location.search}`,
...
...
spec/javascripts/merge_request_tabs_spec.js
View file @
0d53e97e
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
describe
(
'
#activateTab
'
,
function
()
{
describe
(
'
#activateTab
'
,
function
()
{
beforeEach
(
function
()
{
beforeEach
(
function
()
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{});
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{});
fixture
.
load
(
'
merge_request_tabs.html
'
);
fixture
.
load
(
'
merge_request_tabs.html
'
);
this
.
subject
=
this
.
class
.
activateTab
;
this
.
subject
=
this
.
class
.
activateTab
;
});
});
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
describe
(
'
#setCurrentAction
'
,
function
()
{
describe
(
'
#setCurrentAction
'
,
function
()
{
beforeEach
(
function
()
{
beforeEach
(
function
()
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{});
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{});
this
.
subject
=
this
.
class
.
setCurrentAction
;
this
.
subject
=
this
.
class
.
setCurrentAction
;
});
});
it
(
'
changes from commits
'
,
function
()
{
it
(
'
changes from commits
'
,
function
()
{
...
@@ -110,9 +110,9 @@
...
@@ -110,9 +110,9 @@
expect
(
this
.
subject
(
'
show
'
)).
toBe
(
'
/foo/bar/merge_requests/1
'
);
expect
(
this
.
subject
(
'
show
'
)).
toBe
(
'
/foo/bar/merge_requests/1
'
);
});
});
});
});
describe
(
'
#loadDiff
'
,
function
()
{
describe
(
'
#loadDiff
'
,
function
()
{
it
(
'
requires an absolute pathname
'
,
function
()
{
it
(
'
requires an absolute pathname
'
,
function
()
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
(
options
)
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
(
options
)
{
expect
(
options
.
url
).
toEqual
(
'
/foo/bar/merge_requests/1/diffs.json
'
);
expect
(
options
.
url
).
toEqual
(
'
/foo/bar/merge_requests/1/diffs.json
'
);
});
});
this
.
class
.
loadDiff
(
'
/foo/bar/merge_requests/1/diffs
'
);
this
.
class
.
loadDiff
(
'
/foo/bar/merge_requests/1/diffs
'
);
...
...
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