Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-12-31 12:10:35 +00:00
parent 81baec4ab3
commit b69895951e
3 changed files with 6 additions and 2 deletions

View file

@ -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"

View file

@ -0,0 +1,5 @@
---
title: Enlarge the timeline toggle button
merge_request: 50284
author:
type: fixed

View file

@ -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') }