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
69399a47
Commit
69399a47
authored
Dec 12, 2019
by
Justin Boyson
Committed by
Mike Greiling
Dec 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update batch diffs page size
As per @oswaldo page size should be 20 not 10.
parent
27ec6427
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
app/assets/javascripts/diffs/constants.js
app/assets/javascripts/diffs/constants.js
+1
-1
spec/javascripts/diffs/store/actions_spec.js
spec/javascripts/diffs/store/actions_spec.js
+5
-3
No files found.
app/assets/javascripts/diffs/constants.js
View file @
69399a47
...
...
@@ -57,4 +57,4 @@ export const MIN_RENDERING_MS = 2;
export
const
START_RENDERING_INDEX
=
200
;
export
const
INLINE_DIFF_LINES_KEY
=
'
highlighted_diff_lines
'
;
export
const
PARALLEL_DIFF_LINES_KEY
=
'
parallel_diff_lines
'
;
export
const
DIFFS_PER_PAGE
=
1
0
;
export
const
DIFFS_PER_PAGE
=
2
0
;
spec/javascripts/diffs/store/actions_spec.js
View file @
69399a47
...
...
@@ -5,6 +5,7 @@ import {
DIFF_VIEW_COOKIE_NAME
,
INLINE_DIFF_VIEW_TYPE
,
PARALLEL_DIFF_VIEW_TYPE
,
DIFFS_PER_PAGE
,
}
from
'
~/diffs/constants
'
;
import
actions
,
{
setBaseConfig
,
...
...
@@ -144,10 +145,11 @@ describe('DiffsStoreActions', () => {
});
describe
(
'
fetchDiffFilesBatch
'
,
()
=>
{
it
(
'
should fetch batch diff files
'
,
done
=>
{
// eslint-disable-next-line jasmine/no-focused-tests
fit
(
'
should fetch batch diff files
'
,
done
=>
{
const
endpointBatch
=
'
/fetch/diffs_batch
'
;
const
batch1
=
`
${
endpointBatch
}
?per_page=
10
`
;
const
batch2
=
`
${
endpointBatch
}
?per_page=
10
&page=2`
;
const
batch1
=
`
${
endpointBatch
}
?per_page=
${
DIFFS_PER_PAGE
}
`
;
const
batch2
=
`
${
endpointBatch
}
?per_page=
${
DIFFS_PER_PAGE
}
&page=2`
;
const
mock
=
new
MockAdapter
(
axios
);
const
res1
=
{
diff_files
:
[],
pagination
:
{
next_page
:
2
}
};
const
res2
=
{
diff_files
:
[],
pagination
:
{}
};
...
...
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