summaryrefslogtreecommitdiffstats
path: root/app/controllers/watchers_controller.rb
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2023-12-21 07:02:33 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2023-12-21 07:02:33 +0000
commit250d6ea6d4dc8db24e5cf728fc2aab00678329a2 (patch)
tree37256fa9c8e82607dd0af44dbe8a2c1e60a016db /app/controllers/watchers_controller.rb
parent8f3a8c4dbad04588434165c5f4b31e89e22c73eb (diff)
downloadredmine-250d6ea6d4dc8db24e5cf728fc2aab00678329a2.tar.gz
redmine-250d6ea6d4dc8db24e5cf728fc2aab00678329a2.zip
Merge r22538 and r22539 from trunk to 5.1-stable (#39894).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22540 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/watchers_controller.rb')
-rw-r--r--app/controllers/watchers_controller.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 58c875b0c..dbacb5c76 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -32,7 +32,12 @@ class WatchersController < ApplicationController
accept_api_auth :create, :destroy
def new
- @users = users_for_new_watcher
+ respond_to do |format|
+ format.html { render_404 }
+ format.js do
+ @users = users_for_new_watcher
+ end
+ end
end
def create