diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-17 19:45:04 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-17 19:45:04 +0300 |
| commit | 9162e34bb078be9f4fb35b7e43f89c926dc3bcd8 (patch) | |
| tree | 7d93fd0f30f83fb2fb2e502a4891aa2f1571fbc7 /app/controllers | |
| parent | 409097bd7e0f5857cf0bc5462bd47484980ec787 (diff) | |
| parent | 22fcb2f418ed6a2c7e68c0cd3ec2d414510ad4ec (diff) | |
Merge branch 'issue_subscription' into 'master'
Subscription to issue/mr
Fixes #1911 and #1909
See merge request !1702
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 4266bcaef16..88302276b5e 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -1,6 +1,6 @@ class Projects::IssuesController < Projects::ApplicationController before_filter :module_enabled - before_filter :issue, only: [:edit, :update, :show] + before_filter :issue, only: [:edit, :update, :show, :toggle_subscription] # Allow read any issue before_filter :authorize_read_issue! @@ -97,6 +97,12 @@ class Projects::IssuesController < Projects::ApplicationController redirect_to :back, notice: "#{result[:count]} issues updated" end + def toggle_subscription + @issue.toggle_subscription(current_user) + + render nothing: true + end + protected def issue diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 93d79d81661..c63a9b0cd44 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -2,7 +2,7 @@ require 'gitlab/satellite/satellite' class Projects::MergeRequestsController < Projects::ApplicationController before_filter :module_enabled - before_filter :merge_request, only: [:edit, :update, :show, :diffs, :automerge, :automerge_check, :ci_status] + before_filter :merge_request, only: [:edit, :update, :show, :diffs, :automerge, :automerge_check, :ci_status, :toggle_subscription] before_filter :closes_issues, only: [:edit, :update, :show, :diffs] before_filter :validates_merge_request, only: [:show, :diffs] before_filter :define_show_vars, only: [:show, :diffs] @@ -174,6 +174,12 @@ class Projects::MergeRequestsController < Projects::ApplicationController render json: response end + def toggle_subscription + @merge_request.toggle_subscription(current_user) + + render nothing: true + end + protected def selected_target_project |