From 338c082e830d360e053d1f78cd661fbf20001968 Mon Sep 17 00:00:00 2001 From: Ivan Semenov Date: Mon, 15 Jun 2020 15:02:02 +0300 Subject: [PATCH] [github] Show unknown timeline events only in internal mode GitOrigin-RevId: 10c2803122322c69cd5a56c9f93236cd0fa252ea --- .../github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt index 2b6e9defeb76..fd55d8431713 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineMergingModel.kt @@ -1,6 +1,7 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.github.pullrequest.ui.timeline +import com.intellij.openapi.application.ApplicationManager import com.intellij.util.text.DateFormatUtil import org.jetbrains.plugins.github.api.data.pullrequest.timeline.GHPRTimelineEvent import org.jetbrains.plugins.github.api.data.pullrequest.timeline.GHPRTimelineItem @@ -24,7 +25,9 @@ class GHPRTimelineMergingModel : AbstractListModel() { } var added = false + val hideUnknown = ApplicationManager.getApplication().let { !it.isInternal && !it.isEAP } for (item in items) { + if (hideUnknown && item is GHPRTimelineItem.Unknown) continue val merged = mergeIfPossible(lastItem, item) if (merged != null) { lastItem = merged