Merge branch 'hipchat_placeholder' into 'master'

Add placeholder values to hipchat service This MR adds placeholder values to the hipchat service. This should prevent issues like #279 or #772 that popped up because people didn't know what exactly they are supposed to enter in the fields. See merge request !294

Merge branch 'hipchat_placeholder' into 'master'
390e3802 · Dmitriy Zaporozhets · ab651ef4 · 33fea089 · 390e3802
Commit 390e3802 authored Jan 18, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

hipchat_service.rb app/models/project_services/hipchat_service.rb +2 -2

No files found.
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -32,8 +32,8 @@ class HipchatService < Service

  def fields
    [
-      { type: 'text', name: 'token',     placeholder: '' },
-      { type: 'text', name: 'room',      placeholder: '' },
+      { type: 'text', name: 'token',     placeholder: 'Room token' },
+      { type: 'text', name: 'room',      placeholder: 'Room name or ID' },
      { type: 'text', name: 'server',
        placeholder: 'Leave blank for default. https://hipchat.example.com' }
    ]