summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-07-25 22:43:47 -0600
committerDouwe Maan <douwe@selenight.nl>2016-07-25 22:45:23 -0600
commiteeb41c759e246bf96bda8d8f02478860cc6448bb (patch)
tree769a75a90e011553062806966773893de2cee5e7 /config
parented6c8238f3524feeab187b607362806ed1c666ad (diff)
downloadgitlab-ce-eeb41c759e246bf96bda8d8f02478860cc6448bb.tar.gz
Add endpoints to resolve diff notes and discussions
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb
index cf2f96c74dd..40dce1745db 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -720,6 +720,13 @@ Rails.application.routes.draw do
get :update_branches
get :diff_for_path
end
+
+ resources :discussions, only: [], constraints: { id: /\h{40}/ } do
+ member do
+ post :resolve
+ delete :resolve, action: :unresolve
+ end
+ end
end
resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
@@ -825,14 +832,11 @@ Rails.application.routes.draw do
resources :group_links, only: [:index, :create, :destroy], constraints: { id: /\d+/ }
resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do
- collection do
- post :resolve_all
- end
-
member do
post :toggle_award_emoji
delete :delete_attachment
post :resolve
+ delete :resolve, action: :unresolve
end
end