Merge branch 'ee-to-ce-2017-09-22' into 'master'

Don't show %board-add-issues-modal if there's no project

See merge request gitlab-org/gitlab-ce!14442

app/views/shared/boards/_show.html.haml

@@ -31,10 +31,11 @@
       ":board-id" => "boardId",
       ":key" => "_uid" }
   = render "shared/boards/components/sidebar"
+  - if @project
     %board-add-issues-modal{ "new-issue-path" => new_project_issue_path(@project),
       "milestone-path" => milestones_filter_dropdown_path,
       "label-path" => labels_filter_path,
       "empty-state-svg" => image_path('illustrations/issues.svg'),
       ":issue-link-base" => "issueLinkBase",
       ":root-path" => "rootPath",
-    ":project-id" => @project.try(:id) }
+      ":project-id" => @project.id }