From 2421e15d7ad3999658dafc5a9be39c7d8292d885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= <timothee.alby@gmail.com>
Date: Thu, 25 Oct 2018 17:07:50 +0200
Subject: [PATCH] Merge pull request #1060 from sharelatex/ja-remove-v2-banner

Remove unneeded v2 banner

GitOrigin-RevId: 972afc2bd07ab64b0dd558cf1f15c0272f575b87
---
 .../app/coffee/infrastructure/Features.coffee |  2 --
 .../app/views/project/list/notifications.pug  | 24 -------------------
 2 files changed, 26 deletions(-)

diff --git a/services/web/app/coffee/infrastructure/Features.coffee b/services/web/app/coffee/infrastructure/Features.coffee
index 7d47876773..5faceae9ce 100644
--- a/services/web/app/coffee/infrastructure/Features.coffee
+++ b/services/web/app/coffee/infrastructure/Features.coffee
@@ -14,8 +14,6 @@ module.exports = Features =
 				return Settings.enableGithubSync
 			when 'v1-return-message'
 				return Settings.accountMerge? and Settings.overleaf?
-			when 'v2-banner'
-				return Settings.showV2Banner
 			when 'custom-togglers'
 				return Settings.overleaf?
 			when 'publish-templates'
diff --git a/services/web/app/views/project/list/notifications.pug b/services/web/app/views/project/list/notifications.pug
index b6b8c23af4..276ce806d2 100644
--- a/services/web/app/views/project/list/notifications.pug
+++ b/services/web/app/views/project/list/notifications.pug
@@ -1,27 +1,3 @@
-if hasFeature('v2-banner')
-	.userNotifications
-		ul.list-unstyled.notifications-list(ng-controller="OverleafV2NotificationController", ng-show="visible")
-			li.notification_entry
-				.row
-					.col-xs-12
-						.alert.alert-danger
-							.notification_inner
-								.notification_body(event-tracking="sees_v2_banner_2" event-tracking-mb="true" event-segmentation="{location: 'welcome', v2_onboard: true}" event-tracking-trigger="load" event-tracking-send-once="true")
-									a.btn.btn-info.btn-sm.pull-right(
-										event-tracking="go_to_v2"
-										event-tracking-mb="true"
-										event-segmentation="{location: 'welcome', v2_onboard: true}"
-										event-tracking-trigger="click"
-										href="/user/login_to_ol_v2"
-										style="margin-left: 8px;"
-									) Go to Overleaf v2
-									i.fa.fa-bullhorn
-									| &nbsp;Good news! Overleaf and ShareLaTeX have joined forces to bring you <em>Overleaf v2</em>, which is based on the ShareLaTeX editor and combines the best of both services. All ShareLaTeX accounts will move to Overleaf v2 on <strong>September 4th, 2018</strong> (<a event-tracking="click_v2_read_more" event-tracking-mb="true" event-segmentation="{location: 'welcome', v2_onboard: true}" event-tracking-trigger="click" href="https://www.overleaf.com/blog/654-overleaf-v2-launch-announcement" style="text-decoration: underline">read more</a>). You can also <a href="/user/login_to_ol_v2" style="text-decoration: underline">try Overleaf v2 now</a>.
-								.notification_close
-									button(ng-click="dismiss()" event-tracking="closes_v2_banner" event-tracking-mb="true" event-segmentation="{location: 'welcome', v2_onboard: true}"  event-tracking-trigger="click").close.pull-right
-										span(aria-hidden="true") &times;
-										span.sr-only #{translate("close")}
-
 span(ng-controller="NotificationsController").userNotifications
 	ul.list-unstyled.notifications-list(
 		ng-if="notifications.length > 0",