+
+
+ {{ issueWeight }}
+
+
+ {{ maxLimitText }}
+
+
+
diff --git a/app/assets/javascripts/boards/constants.js b/app/assets/javascripts/boards/constants.js
index f5e161efe5e..4dda68eed69 100644
--- a/app/assets/javascripts/boards/constants.js
+++ b/app/assets/javascripts/boards/constants.js
@@ -216,4 +216,18 @@ export const BOARD_CARD_MOVE_TO_POSITIONS_OPTIONS = [
},
];
+export const WIP_ITEMS = 'issue_count';
+export const WIP_WEIGHT = 'issue_weights';
+
+export const WIP_CATEGORY_LIST = [
+ {
+ value: WIP_ITEMS,
+ text: s__('Boards|Items'),
+ },
+ {
+ value: WIP_WEIGHT,
+ text: s__('Boards|Weight'),
+ },
+];
+
export const GroupByParamType = {};
diff --git a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
index 44a38c1776a..f6269a7eb38 100644
--- a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
+++ b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
@@ -47,7 +47,7 @@ export default {
coveragePercentage: '',
chartOptions: {
yAxis: {
- name: __('Bi-weekly code coverage'),
+ name: __('Code Coverage in %%'),
type: 'value',
min: 0,
max: 100,
diff --git a/app/assets/javascripts/time_tracking/components/timelogs_app.vue b/app/assets/javascripts/time_tracking/components/timelogs_app.vue
index 28749095e50..ec24b1a02fe 100644
--- a/app/assets/javascripts/time_tracking/components/timelogs_app.vue
+++ b/app/assets/javascripts/time_tracking/components/timelogs_app.vue
@@ -119,7 +119,7 @@ export default {
const { timeSpentTo } = this;
if (timeSpentTo) {
- timeSpentTo.setDate(timeSpentTo.getDate() + 1);
+ timeSpentTo.setHours(23, 59, 59, 999);
}
this.queryVariables = {
diff --git a/app/assets/javascripts/token_access/components/inbound_token_access.vue b/app/assets/javascripts/token_access/components/inbound_token_access.vue
index 2bd3c36021e..c0cf55e93b8 100644
--- a/app/assets/javascripts/token_access/components/inbound_token_access.vue
+++ b/app/assets/javascripts/token_access/components/inbound_token_access.vue
@@ -17,7 +17,6 @@ import { helpPagePath } from '~/helpers/help_page_helper';
import { TYPENAME_CI_JOB_TOKEN_ACCESSIBLE_GROUP } from '~/graphql_shared/constants';
import CrudComponent from '~/vue_shared/components/crud_component.vue';
import ConfirmActionModal from '~/vue_shared/components/confirm_action_modal.vue';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import inboundRemoveProjectCIJobTokenScopeMutation from '../graphql/mutations/inbound_remove_project_ci_job_token_scope.mutation.graphql';
import inboundRemoveGroupCIJobTokenScopeMutation from '../graphql/mutations/inbound_remove_group_ci_job_token_scope.mutation.graphql';
import inboundUpdateCIJobTokenScopeMutation from '../graphql/mutations/inbound_update_ci_job_token_scope.mutation.graphql';
@@ -92,8 +91,7 @@ export default {
directives: {
GlTooltip: GlTooltipDirective,
},
- mixins: [glFeatureFlagsMixin()],
- inject: ['enforceAllowlist', 'fullPath', 'projectAllowlistLimit'],
+ inject: ['enforceAllowlist', 'fullPath', 'projectAllowlistLimit', 'isJobTokenPoliciesEnabled'],
apollo: {
authLogCount: {
query: getAuthLogCountQuery,
@@ -189,9 +187,6 @@ export default {
this.allowlistLoadingMessage.length > 0
);
},
- isJobTokenPoliciesEnabled() {
- return this.glFeatures.addPoliciesToCiJobToken;
- },
ciJobTokenHelpPage() {
return helpPagePath('ci/jobs/ci_job_token', {
anchor: 'control-job-token-access-to-your-project',
diff --git a/app/assets/javascripts/token_access/components/namespace_form.vue b/app/assets/javascripts/token_access/components/namespace_form.vue
index dda1ebffd68..9b1ea0a5a60 100644
--- a/app/assets/javascripts/token_access/components/namespace_form.vue
+++ b/app/assets/javascripts/token_access/components/namespace_form.vue
@@ -1,15 +1,13 @@