summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-04-01 10:49:56 +0000
committerNick Thomas <nick@gitlab.com>2019-04-01 10:49:56 +0000
commit433cc96551a6d1f1621f9e105b1e7eb1ccc41b7a (patch)
treea355cd32ff76ec9ed07acf968af5fc1a0db7f540 /lib
parent0a0388cc81bac3ebc54cf47715cb90566b207a7f (diff)
parent84d96bed60f6ffd7a1bc81f0c99ad7ff3296ef95 (diff)
downloadgitlab-shell-433cc96551a6d1f1621f9e105b1e7eb1ccc41b7a.tar.gz
Merge branch 'display-post-receive-warnings' into 'master'
Display post receive warnings from Rails See merge request gitlab-org/gitlab-shell!288
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab_post_receive.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/gitlab_post_receive.rb b/lib/gitlab_post_receive.rb
index 2d412b9..7c5bd19 100644
--- a/lib/gitlab_post_receive.rb
+++ b/lib/gitlab_post_receive.rb
@@ -24,10 +24,11 @@ class GitlabPostReceive
end
return false unless response
- print_broadcast_message(response['broadcast_message']) if response['broadcast_message']
+ print_formatted_alert_message(response['broadcast_message']) if response['broadcast_message']
print_merge_request_links(response['merge_request_urls']) if response['merge_request_urls']
puts response['redirected_message'] if response['redirected_message']
puts response['project_created_message'] if response['project_created_message']
+ print_warnings(response['warnings']) if response['warnings']
response['reference_counter_decreased']
rescue GitlabNet::ApiUnreachableError
@@ -59,7 +60,12 @@ class GitlabPostReceive
puts
end
- def print_broadcast_message(message)
+ def print_warnings(warnings)
+ message = "WARNINGS:\n#{warnings}"
+ print_formatted_alert_message(message)
+ end
+
+ def print_formatted_alert_message(message)
# A standard terminal window is (at least) 80 characters wide.
total_width = 80