diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 19:23:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 19:23:39 +0000 |
| commit | 390e38022539d9fd949fea701791945fea500703 (patch) | |
| tree | 156bde0cf25e12fac0743d3a7d015c7f45128495 | |
| parent | ab651ef45ced72dadb32ce7bdbd0f040fc2652fc (diff) | |
| parent | 33fea08944915f1d27c78ede2fa5d1f973b9eb49 (diff) | |
| download | gitlab-ce-390e38022539d9fd949fea701791945fea500703.tar.gz | |
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
| -rw-r--r-- | app/models/project_services/hipchat_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index aafc3efa970..c4c563b3cca 100644 --- 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' } ] |