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
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-07 20:55:09 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-07 20:55:09 +0400
commitd238a21bcb44d2f0fc7f027ccc19c613050f77e8 (patch)
treec0288a2f6a42481bfdad0b915211a6bf5088b863 /app/controllers
parent38ae34a30131aef38623ac5cf8c510ad04fc26a6 (diff)
parent4cc2afdf2eb414cb4aeea5ffab1ac86f56e97a55 (diff)
Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook
Fix url generation error on hook invalid create
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/hooks_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index a863b318324..c43d26385f7 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -18,7 +18,7 @@ class Projects::HooksController < Projects::ApplicationController
if @hook.valid?
redirect_to project_hooks_path(@project)
else
- @hooks = @project.hooks
+ @hooks = @project.hooks.select(&:persisted?)
render :index
end
end