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
e26c47fa
Commit
e26c47fa
authored
Jun 24, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
14e97c14
97e8f494
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
5 deletions
+13
-5
app/assets/javascripts/vue_shared/components/pagination/constants.js
...javascripts/vue_shared/components/pagination/constants.js
+2
-2
changelogs/unreleased/update-pagination-texts.yml
changelogs/unreleased/update-pagination-texts.yml
+5
-0
doc/user/project/deploy_boards.md
doc/user/project/deploy_boards.md
+4
-1
spec/javascripts/vue_shared/components/table_pagination_spec.js
...avascripts/vue_shared/components/table_pagination_spec.js
+2
-2
No files found.
app/assets/javascripts/vue_shared/components/pagination/constants.js
View file @
e26c47fa
...
...
@@ -3,8 +3,8 @@ import { s__ } from '~/locale';
export
const
PAGINATION_UI_BUTTON_LIMIT
=
4
;
export
const
UI_LIMIT
=
6
;
export
const
SPREAD
=
'
...
'
;
export
const
PREV
=
s__
(
'
Pagination|Prev
'
);
export
const
NEXT
=
s__
(
'
Pagination|Next
'
);
export
const
PREV
=
s__
(
'
Pagination|
‹
Prev
'
);
export
const
NEXT
=
s__
(
'
Pagination|Next
›
'
);
export
const
FIRST
=
s__
(
'
Pagination|« First
'
);
export
const
LAST
=
s__
(
'
Pagination|Last »
'
);
export
const
LABEL_FIRST_PAGE
=
s__
(
'
Pagination|Go to first page
'
);
...
...
changelogs/unreleased/update-pagination-texts.yml
0 → 100644
View file @
e26c47fa
---
title
:
Update pagination prev and next texts
merge_request
:
29911
author
:
type
:
other
doc/user/project/deploy_boards.md
View file @
e26c47fa
...
...
@@ -88,7 +88,10 @@ To display the Deploy Boards for a specific [environment] you should:
Kubernetes.
NOTE:
**Note:**
Matching based on the Kubernetes
`app`
label was removed in
[
GitLab 12.1
](
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14020
)
Matching based on the Kubernetes
`app`
label was removed in
[
GitLab
12.1
](
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14020
)
.
To migrate, please apply the required annotations (see above) and
re-deploy your application.
![Deploy Boards Kubernetes Label](img/deploy_boards_kubernetes_label.png)
...
...
spec/javascripts/vue_shared/components/table_pagination_spec.js
View file @
e26c47fa
...
...
@@ -217,7 +217,7 @@ describe('Pagination component', () => {
change
:
spy
,
});
expect
(
component
.
$el
.
querySelector
(
'
.js-next-button
'
).
textContent
.
trim
()).
toEqual
(
'
Next
'
);
expect
(
component
.
$el
.
querySelector
(
'
.js-next-button
'
).
textContent
.
trim
()).
toEqual
(
'
Next
›
'
);
component
.
$el
.
querySelector
(
'
.js-next-button .page-link
'
).
click
();
...
...
@@ -237,7 +237,7 @@ describe('Pagination component', () => {
change
:
spy
,
});
expect
(
component
.
$el
.
querySelector
(
'
.js-next-button
'
).
textContent
.
trim
()).
toEqual
(
'
Next
'
);
expect
(
component
.
$el
.
querySelector
(
'
.js-next-button
'
).
textContent
.
trim
()).
toEqual
(
'
Next
›
'
);
component
.
$el
.
querySelector
(
'
.js-next-button .page-link
'
).
click
();
...
...
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