diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-16 18:24:51 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-11-01 16:26:49 +0300 |
| commit | 99ed544e8be057b644bb739a81a098192a6cf886 (patch) | |
| tree | c8b6f2ea6f8053e2cb8883cc685d3093b91af0a8 | |
| parent | 8ea63cdada06d36adee3fa57ed49d20b949544db (diff) | |
Merge branch 'fix_global_board_routes_39073' into 'master'
Remove "boards" from TOP_LEVEL_ROUTES
Closes #39073
See merge request gitlab-org/gitlab-ce!14861
# Conflicts:
# config/routes.rb
| -rw-r--r-- | app/assets/javascripts/boards/services/board_service.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix_global_board_routes_39073.yml | 5 | ||||
| -rw-r--r-- | config/routes.rb | 14 | ||||
| -rw-r--r-- | lib/gitlab/path_regex.rb | 1 |
4 files changed, 21 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/services/board_service.js b/app/assets/javascripts/boards/services/board_service.js index 38eea38f949..97e80afa3f8 100644 --- a/app/assets/javascripts/boards/services/board_service.js +++ b/app/assets/javascripts/boards/services/board_service.js @@ -7,7 +7,7 @@ class BoardService { this.boards = Vue.resource(`${boardsEndpoint}{/id}.json`, {}, { issues: { method: 'GET', - url: `${gon.relative_url_root}/boards/${boardId}/issues.json`, + url: `${gon.relative_url_root}/-/boards/${boardId}/issues.json`, } }); this.lists = Vue.resource(`${listsEndpoint}{/id}`, {}, { @@ -16,7 +16,7 @@ class BoardService { url: `${listsEndpoint}/generate.json` } }); - this.issue = Vue.resource(`${gon.relative_url_root}/boards/${boardId}/issues{/id}`, {}); + this.issue = Vue.resource(`${gon.relative_url_root}/-/boards/${boardId}/issues{/id}`, {}); this.issues = Vue.resource(`${listsEndpoint}{/id}/issues`, {}, { bulkUpdate: { method: 'POST', diff --git a/changelogs/unreleased/fix_global_board_routes_39073.yml b/changelogs/unreleased/fix_global_board_routes_39073.yml new file mode 100644 index 00000000000..cc9ae8592db --- /dev/null +++ b/changelogs/unreleased/fix_global_board_routes_39073.yml @@ -0,0 +1,5 @@ +--- +title: Allow boards as top level route +merge_request: +author: +type: fixed diff --git a/config/routes.rb b/config/routes.rb index 5683725c8a2..6c5a965feb2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -44,6 +44,19 @@ Rails.application.routes.draw do get 'readiness' => 'health#readiness' resources :metrics, only: [:index] mount Peek::Railtie => '/peek' + + # Boards resources shared between group and projects + resources :boards, only: [] do + resources :lists, module: :boards, only: [:index, :create, :update, :destroy] do + collection do + post :generate + end + + resources :issues, only: [:index, :create, :update] + end + + resources :issues, module: :boards, only: [:index, :update] + end end # Koding route @@ -87,6 +100,7 @@ Rails.application.routes.draw do resources :issues, module: :boards, only: [:index, :update] end + draw :google_api draw :import draw :uploads draw :explore diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index 7c02c9c5c48..894bd5efae5 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -26,7 +26,6 @@ module Gitlab apple-touch-icon.png assets autocomplete - boards ci dashboard deploy.html |