diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 09:07:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 09:07:53 +0300 |
| commit | 90726a8ccc9df6d9b5ff4f5e1eb31d015c1db8e2 (patch) | |
| tree | c5992348be5d8d81656ce665efd6980bfa8fbf71 /app/assets/javascripts/sidebar | |
| parent | 48d9e7ff8ddfe152686d450fa5ac511f12d42d5b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/report.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/report.vue b/app/assets/javascripts/sidebar/components/time_tracking/report.vue index 5d4031ac68b..d9797961d40 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/report.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/report.vue @@ -78,9 +78,9 @@ export default { }, }, fields: [ - { key: 'spentAt', label: __('Spent At'), sortable: true }, + { key: 'spentAt', label: __('Spent At'), sortable: true, tdClass: 'gl-w-quarter' }, { key: 'user', label: __('User'), sortable: true }, - { key: 'timeSpent', label: __('Time Spent'), sortable: true }, + { key: 'timeSpent', label: __('Time Spent'), sortable: true, tdClass: 'gl-w-15' }, { key: 'summary', label: __('Summary / Note'), sortable: true }, ], }; 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 ea57dedc4ab..e7d47634af2 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -249,6 +249,7 @@ export default { </gl-link> <gl-modal modal-id="time-tracking-report" + size="lg" :title="__('Time tracking report')" :hide-footer="true" > |