diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 15:15:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 15:15:31 +0300 |
| commit | 6de2a04a4e355dcea04f4f0e7b25033537dad147 (patch) | |
| tree | 64ae2aadebeaeb2ce54e644528df3a4f38c9059d /app/assets/javascripts/runner | |
| parent | 6c744c5ac9f40a5ea8e1fd3b1482fcfa3876c4e9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/runner')
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue index a968d4029f8..b458722af52 100644 --- a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue +++ b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue @@ -187,6 +187,7 @@ export default { deep: true, handler() { // TODO Implement back button response using onpopstate + // See: https://gitlab.com/gitlab-org/gitlab/-/issues/333804 updateHistory({ url: fromSearchToUrl(this.search), title: document.title, diff --git a/app/assets/javascripts/runner/constants.js b/app/assets/javascripts/runner/constants.js index 1544efaaae2..d88c2c0f919 100644 --- a/app/assets/javascripts/runner/constants.js +++ b/app/assets/javascripts/runner/constants.js @@ -91,8 +91,8 @@ export const ACCESS_LEVEL_REF_PROTECTED = 'REF_PROTECTED'; // CiRunnerSort export const CREATED_DESC = 'CREATED_DESC'; -export const CREATED_ASC = 'CREATED_ASC'; // TODO Add this to the API -export const CONTACTED_DESC = 'CONTACTED_DESC'; // TODO Add this to the API +export const CREATED_ASC = 'CREATED_ASC'; +export const CONTACTED_DESC = 'CONTACTED_DESC'; export const CONTACTED_ASC = 'CONTACTED_ASC'; export const DEFAULT_SORT = CREATED_DESC; diff --git a/app/assets/javascripts/runner/group_runners/group_runners_app.vue b/app/assets/javascripts/runner/group_runners/group_runners_app.vue index c4ee0ad4dfb..8a37df00765 100644 --- a/app/assets/javascripts/runner/group_runners/group_runners_app.vue +++ b/app/assets/javascripts/runner/group_runners/group_runners_app.vue @@ -190,6 +190,7 @@ export default { deep: true, handler() { // TODO Implement back button reponse using onpopstate + // See https://gitlab.com/gitlab-org/gitlab/-/issues/333804 updateHistory({ url: fromSearchToUrl(this.search), title: document.title, |