summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-08-17 12:10:09 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-08-17 12:10:09 -0600
commitd8654744cd6c8fa4cbe4617c2428cd79d4bd5179 (patch)
tree159d92727944184792c939210b5b73aaf348336a /config
parent4a13aa9f34ab4114bc485e1ca8fa0db8daa0394b (diff)
parent46dc00631aeae34c1964888625c5ccd04da6b4c1 (diff)
downloadgitlab-ce-d8654744cd6c8fa4cbe4617c2428cd79d4bd5179.tar.gz
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
-rw-r--r--config/routes.rb17
2 files changed, 19 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 60a4e1f134e..6b80f8ddafa 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -86,6 +86,8 @@ module Gitlab
config.assets.precompile << "network/network_bundle.js"
config.assets.precompile << "profile/profile_bundle.js"
config.assets.precompile << "diff_notes/diff_notes_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 d5393455b89..624e07b0947 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -727,7 +727,9 @@ Rails.application.routes.draw do
member do
get :commits
get :diffs
+ get :conflicts
get :builds
+ get :pipelines
get :merge_check
post :merge
post :cancel_merge_when_build_succeeds
@@ -736,6 +738,7 @@ Rails.application.routes.draw do
post :toggle_award_emoji
post :remove_wip
get :diff_for_path
+ post :resolve_conflicts
end
collection do
@@ -865,6 +868,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