summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-28 13:07:08 +0100
committerPhil Hughes <me@iamphill.com>2016-10-28 13:54:36 +0100
commit07e4ffd7085c8154c5f44f8d6d6ff11a4381be46 (patch)
tree81079ec7bf2973b9c4af7722189311086f356f4b
parenta2e9bc3584a735c010bbda3cef913601543cfa07 (diff)
downloadgitlab-ce-issue-board-welcome-cookie-monster.tar.gz
Fixed boards store specissue-board-welcome-cookie-monster
-rw-r--r--app/controllers/projects_controller.rb3
-rw-r--r--spec/javascripts/boards/boards_store_spec.js.es65
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', () => {