Improve broadcast message API

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index a50ee4659a3..228a719fbdf 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -83,7 +83,7 @@ module API
     end
 
     def authenticate_by_gitlab_shell_token!
-      unauthorized! unless secret_token == params['secret_token']
+      unauthorized! unless secret_token == params['secret_token'].try(:chomp)
     end
 
     def authenticated_as_admin!
@@ -236,7 +236,7 @@ module API
     end
 
     def secret_token
-      File.read(Rails.root.join('.gitlab_shell_secret'))
+      File.read(Rails.root.join('.gitlab_shell_secret')).chomp
     end
 
     def handle_member_errors(errors)
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 04ff049989b..ba3fe619b92 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -73,6 +73,8 @@ module API
       get "/broadcast_message" do
         if message = BroadcastMessage.current
           present message, with: Entities::BroadcastMessage
+        else
+          {}
         end
       end
     end