diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-05 03:19:37 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-05 03:19:37 +0300 |
commit | b54228ad3d79dc0bd7060128e0b75f68cd1c51d9 (patch) | |
tree | 1883aaa4e35d0563fa5fe88145fa0f7d976b0b4f /lib/api | |
parent | 3ccb4d954f4c51f4f3cc77ebd53f21425e0d4d09 (diff) | |
parent | 6b7a9b7498a4c91ca9c7324a0e31d8a142fddeef (diff) |
Merge branch '9217-warn-on-git-fetch-over-ssh-if-the-secondary-is-lagging-the-primary' into 'master'
Display console messages, if available
See merge request gitlab-org/gitlab-ce!26692
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/internal.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index cb9aa849eeb..9c7b9146c8f 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -87,7 +87,8 @@ module API gl_id: Gitlab::GlId.gl_id(user), gl_username: user&.username, git_config_options: [], - gitaly: gitaly_payload(params[:action]) + gitaly: gitaly_payload(params[:action]), + gl_console_messages: check_result.console_messages } # Custom option for git-receive-pack command |