diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:45 +0000 |
| commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
| tree | b6505abedcd965ebae5118b504b185b63129dc4c /app/assets/javascripts/sidebar/components | |
| parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) | |
| download | gitlab-ce-aaf59610548d9b0fd01acfd50e831cbe519ecba2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar/components')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/assignees.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.vue b/app/assets/javascripts/sidebar/components/assignees/assignees.vue index d9739e8d197..f16b16a6837 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignees.vue @@ -4,7 +4,7 @@ import UncollapsedAssigneeList from '../assignees/uncollapsed_assignee_list.vue' export default { // name: 'Assignees' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings name: 'Assignees', components: { CollapsedAssigneeList, diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue index 682ca600b6a..1e8a31fff81 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -40,6 +40,7 @@ export default { limitToHours: { type: Boolean, default: false, + required: false, }, rootPath: { type: String, |