diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-27 11:44:42 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-27 11:44:42 +0200 |
| commit | 4bdbcf594812d35bab3c2b597fc8087f840bbd4d (patch) | |
| tree | d5e972f6459c9cef3a2716a41e8b23bca293db5f | |
| parent | e9f3d245b00662f66576954578c2cced5c60decb (diff) | |
| parent | 615a77df83cc84e6b3c0ac221035ad88e73a5ac8 (diff) | |
| download | gitlab-ce-4bdbcf594812d35bab3c2b597fc8087f840bbd4d.tar.gz | |
Merge branch 'lleoni-fix-notify-post-receive'
See pull request https://github.com/gitlabhq/gitlabhq/pull/10429
| -rw-r--r-- | changelogs/unreleased/fix-notify-post-receive.yml | 4 | ||||
| -rw-r--r-- | lib/api/internal.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-notify-post-receive.yml b/changelogs/unreleased/fix-notify-post-receive.yml new file mode 100644 index 00000000000..6b68396d5c5 --- /dev/null +++ b/changelogs/unreleased/fix-notify-post-receive.yml @@ -0,0 +1,4 @@ +--- +title: Fixed wrong method call on notify_post_receive +merge_request: +author: Luigi Leoni diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 5b48ee8665f..ebed26dd178 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -140,7 +140,7 @@ module API begin Gitlab::GitalyClient::Notifications.new(project.repository).post_receive rescue GRPC::Unavailable => e - render_api_error(e, 500) + render_api_error!(e, 500) end end end |