Improve broadcast message API

GITLAB_SHELL_VERSION

-2.5.0
+2.5.1

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)

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

spec/requests/api/internal_spec.rb

@@ -32,7 +32,8 @@ describe API::API, api: true  do
       it do
         get api("/internal/broadcast_message"), secret_token: secret_token
 
-        expect(response.status).to eq(404)
+        expect(response.status).to eq(200)
+        expect(json_response).to be_empty
       end
     end
   end