summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-08-17 18:02:26 +0000
committerDouwe Maan <douwe@gitlab.com>2016-08-17 18:02:26 +0000
commit46dc00631aeae34c1964888625c5ccd04da6b4c1 (patch)
tree78698b5129eb4d91eeca9d75712759c1e4a1bce7 /config
parentc063ee5e35146a30825edcfbf15da88585cecdcb (diff)
parent35caa356f6f111a358c7057b9c3cf9b029483343 (diff)
downloadgitlab-ce-46dc00631aeae34c1964888625c5ccd04da6b4c1.tar.gz
Merge branch 'issue-boards' into 'master'
Issue boards ## What are the relevant issue numbers? - Issue: #17907 - Issue backend: #20335 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [X] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5548
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
-rw-r--r--config/routes.rb14
2 files changed, 16 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 4a9ed41cbf8..0c136623477 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -85,6 +85,8 @@ module Gitlab
config.assets.precompile << "users/users_bundle.js"
config.assets.precompile << "network/network_bundle.js"
config.assets.precompile << "profile/profile_bundle.js"
+ config.assets.precompile << "boards/boards_bundle.js"
+ config.assets.precompile << "boards/test_utils/simulate_drag.js"
config.assets.precompile << "lib/utils/*.js"
config.assets.precompile << "lib/*.js"
config.assets.precompile << "u2f.js"
diff --git a/config/routes.rb b/config/routes.rb
index 58e824c0476..9c74df31de5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -859,6 +859,20 @@ Rails.application.routes.draw do
end
end
+ resource :board, only: [:show] do
+ scope module: :boards do
+ resources :issues, only: [:update]
+
+ resources :lists, only: [:index, :create, :update, :destroy] do
+ collection do
+ post :generate
+ end
+
+ resources :issues, only: [:index]
+ end
+ end
+ end
+
resources :todos, only: [:create]
resources :uploads, only: [:create] do