From a2e9bc3584a735c010bbda3cef913601543cfa07 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 14 Oct 2016 18:27:58 +0100
Subject: [PATCH 1/2] Delete issue board welcome cookie when project is new

---
 CHANGELOG.md                                             | 1 +
 app/assets/javascripts/boards/stores/boards_store.js.es6 | 3 ++-
 app/controllers/projects_controller.rb                   | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99991fb805f..f62eef42bff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Please view this file on the master branch, on stable branches it's out of date.
   - API: Fix booleans not recognized as such when using the `to_boolean` helper
   - Removed delete branch tooltip !6954
   - Stop unauthorized users dragging on milestone page (blackst0ne)
+  - Restore issue boards welcome message when a project is created !6899
   - Escape ref and path for relative links !6050 (winniehell)
   - Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose)
   - Fix filtering of milestones with quotes in title (airatshigapov)
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6
index 534845cd8a2..175e034afed 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js.es6
+++ b/app/assets/javascripts/boards/stores/boards_store.js.es6
@@ -63,7 +63,8 @@
       this.removeList('blank');
 
       Cookies.set('issue_board_welcome_hidden', 'true', {
-        expires: 365 * 10
+        expires: 365 * 10,
+        path: ''
       });
     },
     welcomeIsHidden () {
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 76b730198d4..137c0d109e2 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -30,9 +30,12 @@ class ProjectsController < Projects::ApplicationController
     @project = ::Projects::CreateService.new(current_user, project_params).execute
 
     if @project.saved?
+      cookies[:issue_board_welcome_hidden] = { path: project_path(@project), value: nil, expires: Time.at(0) }
+
       redirect_to(
         project_path(@project),
-        notice: "Project '#{@project.name}' was successfully created."
+        notice: "Project '#{@project.name}' was successfully created.",
+        flash: { new_project: true }
       )
     else
       render 'new'

From 07e4ffd7085c8154c5f44f8d6d6ff11a4381be46 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 28 Oct 2016 13:07:08 +0100
Subject: [PATCH 2/2] Fixed boards store spec

---
 app/controllers/projects_controller.rb           | 3 +--
 spec/javascripts/boards/boards_store_spec.js.es6 | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 137c0d109e2..8c148ecfaeb 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -34,8 +34,7 @@ class ProjectsController < Projects::ApplicationController
 
       redirect_to(
         project_path(@project),
-        notice: "Project '#{@project.name}' was successfully created.",
-        flash: { new_project: true }
+        notice: "Project '#{@project.name}' was successfully created."
       )
     else
       render 'new'
diff --git a/spec/javascripts/boards/boards_store_spec.js.es6 b/spec/javascripts/boards/boards_store_spec.js.es6
index 63e487a7ad3..6208c2386b0 100644
--- a/spec/javascripts/boards/boards_store_spec.js.es6
+++ b/spec/javascripts/boards/boards_store_spec.js.es6
@@ -18,7 +18,10 @@
     gl.boardService = new BoardService('/test/issue-boards/board', '1');
     gl.issueBoards.BoardsStore.create();
 
-    Cookies.set('issue_board_welcome_hidden', 'false');
+    Cookies.set('issue_board_welcome_hidden', 'false', {
+      expires: 365 * 10,
+      path: ''
+    });
   });
 
   describe('Store', () => {