Merge remote-tracking branch 'origin/master' into nomenclature

2014-10-07 15:43:59 -04:00 · 2014-10-07 15:43:59 -04:00 · ee9973a395
commit ee9973a395
parent 6c2887ff9b 1850a187d5
9 changed files with 85 additions and 53 deletions
--- a/static/js/app.js
+++ b/static/js/app.js
@ -1391,7 +1391,8 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
          {
            'name': 'notification_token',
            'type': 'string',
-            'title': 'Notification Token'
+            'title': 'Room Notification Token',
+            'help_url': 'https://hipchat.com/rooms/tokens/{room_id}'
          }
        ]
      },