Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-17 19:45:04 +0300
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-17 19:45:04 +0300
commit9162e34bb078be9f4fb35b7e43f89c926dc3bcd8 (patch)
tree7d93fd0f30f83fb2fb2e502a4891aa2f1571fbc7 /config
parent409097bd7e0f5857cf0bc5462bd47484980ec787 (diff)
parent22fcb2f418ed6a2c7e68c0cd3ec2d414510ad4ec (diff)
Merge branch 'issue_subscription' into 'master'
Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index dd70ad2fa0d..e65ef30afb7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -404,6 +404,7 @@ Gitlab::Application.routes.draw do
post :automerge
get :automerge_check
get :ci_status
+ post :toggle_subscription
end
collection do
@@ -437,6 +438,9 @@ Gitlab::Application.routes.draw do
end
resources :issues, constraints: { id: /\d+/ }, except: [:destroy] do
+ member do
+ post :toggle_subscription
+ end
collection do
post :bulk_update
end