diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-11-07 14:14:54 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-11-07 14:14:54 +0300 |
| commit | d2fbf47fd33b1b219cfe9a0195268b929a2e1929 (patch) | |
| tree | 245ec83e6726b4381542ec084ad1c474a83f3089 | |
| parent | 7b6bb06643358c929ecfe84e371dfd62f70f9302 (diff) | |
| parent | 5e4284423f9fdfdaded0a6496341111cad98a3de (diff) | |
Merge branch 'wiki-hook-error' into 'master'
Improve wiki hook error message
See merge request gitlab-org/gitaly!963
| -rw-r--r-- | changelogs/unreleased/wiki-hook-error.yml | 5 | ||||
| -rw-r--r-- | ruby/lib/gitlab/git/committer_with_hooks.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/wiki-hook-error.yml b/changelogs/unreleased/wiki-hook-error.yml new file mode 100644 index 000000000..55007da83 --- /dev/null +++ b/changelogs/unreleased/wiki-hook-error.yml @@ -0,0 +1,5 @@ +--- +title: Improve wiki hook error message +merge_request: 963 +author: +type: fixed diff --git a/ruby/lib/gitlab/git/committer_with_hooks.rb b/ruby/lib/gitlab/git/committer_with_hooks.rb index 32c40feba..5840d81df 100644 --- a/ruby/lib/gitlab/git/committer_with_hooks.rb +++ b/ruby/lib/gitlab/git/committer_with_hooks.rb @@ -21,7 +21,7 @@ module Gitlab result[:newrev] rescue Gitlab::Git::PreReceiveError => e - message = "Custom Hook failed: #{e.message}" + message = "Hook failed: #{e.message}" raise Gitlab::Git::Wiki::OperationError, message end |