diff options
| author | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2017-03-17 17:04:51 +0000 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2017-03-17 17:04:51 +0000 |
| commit | b6bab6ce47813c67ea1e2c7d4fde7d9e320da99c (patch) | |
| tree | 6c1b7db2aeebc5756c73842cffef22df655cc820 /config/routes/dashboard.rb | |
| parent | 116efdaf128ddcccc30fb82615cd964b35cacc53 (diff) | |
| parent | bb1620aaf712c22c61fda098260f481ad79a05e2 (diff) | |
| download | gitlab-ce-b6bab6ce47813c67ea1e2c7d4fde7d9e320da99c.tar.gz | |
Merge branch 'master' into 'focus-mode-board'focus-mode-board
# Conflicts:
# app/views/shared/issuable/_filter.html.haml
Diffstat (limited to 'config/routes/dashboard.rb')
| -rw-r--r-- | config/routes/dashboard.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/dashboard.rb b/config/routes/dashboard.rb index adc3ad207cc..8e380a0b0ac 100644 --- a/config/routes/dashboard.rb +++ b/config/routes/dashboard.rb @@ -13,6 +13,7 @@ resource :dashboard, controller: 'dashboard', only: [] do resources :todos, only: [:index, :destroy] do collection do delete :destroy_all + patch :bulk_restore end member do patch :restore |