From b69895951ee619379ad5a284235c91faa2c8f290 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 31 Dec 2020 12:10:35 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/notes/components/timeline_toggle.vue | 1 - changelogs/unreleased/292517-enlarge-timeline-view-btn.yml | 5 +++++ spec/lib/gitlab/utils/usage_data_spec.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/292517-enlarge-timeline-view-btn.yml diff --git a/app/assets/javascripts/notes/components/timeline_toggle.vue b/app/assets/javascripts/notes/components/timeline_toggle.vue index d1ffe0a3601..8162878f80d 100644 --- a/app/assets/javascripts/notes/components/timeline_toggle.vue +++ b/app/assets/javascripts/notes/components/timeline_toggle.vue @@ -50,7 +50,6 @@ export default { v-gl-tooltip v-track-event="trackToggleTimelineView(timelineEnabled)" icon="comments" - size="small" :selected="timelineEnabled" :title="tooltip" :aria-label="tooltip" diff --git a/changelogs/unreleased/292517-enlarge-timeline-view-btn.yml b/changelogs/unreleased/292517-enlarge-timeline-view-btn.yml new file mode 100644 index 00000000000..44978d9c8f6 --- /dev/null +++ b/changelogs/unreleased/292517-enlarge-timeline-view-btn.yml @@ -0,0 +1,5 @@ +--- +title: Enlarge the timeline toggle button +merge_request: 50284 +author: +type: fixed diff --git a/spec/lib/gitlab/utils/usage_data_spec.rb b/spec/lib/gitlab/utils/usage_data_spec.rb index 099faf170a8..73cbc4a6041 100644 --- a/spec/lib/gitlab/utils/usage_data_spec.rb +++ b/spec/lib/gitlab/utils/usage_data_spec.rb @@ -58,7 +58,7 @@ RSpec.describe Gitlab::Utils::UsageData do expect(described_class.estimate_batch_distinct_count(relation, 'column')).to eq(5) end - context 'quasi integration test for different counting parameters' do + context 'quasi integration test for different counting parameters', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/296169' } do let_it_be(:user) { create(:user, email: 'email1@domain.com') } let_it_be(:another_user) { create(:user, email: 'email2@domain.com') }