From c3df65fc66369fa319cf0815821323006eb70169 Mon Sep 17 00:00:00 2001
From: Tomas Bjerre <tomas.bjerre85@gmail.com>
Date: Mon, 30 Jan 2017 19:22:11 +0100
Subject: [PATCH] Showing description for input and textarea in buttons form
 #190

---
 CHANGELOG.md                           | 25 ++++++++++++++++++++++++-
 README.md                              |  2 ++
 src/main/resources/admin.vm            |  2 +-
 src/main/resources/pr-triggerbutton.js |  4 ++--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87d3bed8..b8c34292 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,12 +3,35 @@
 Changelog of Pull Request Notifier for Bitbucket.
 
 ## Unreleased
+### GitHub [#190](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/190) button forms: descriptions not showing for types input and textarea
+  Showing description for input and textarea in buttons form
+  
+  [11175eea4da9eba](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/11175eea4da9eba) Tomas Bjerre *2017-01-30 18:22:11*
+
+### No issue
+  Doc
+  
+  [cefc0c985ac96ae](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/cefc0c985ac96ae) Tomas Bjerre *2017-01-29 16:25:48*
+
+  Fiddling with Docker
+  
+  [a674860740e4e90](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/a674860740e4e90) Tomas Bjerre *2017-01-29 14:52:39*
+
+## 2.49
 ### GitHub [#187](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/187) Support HTML escaping in variable expansion?
+  Adding HipChat documentation 
+
+ * The HipChat docs were privided by [Rychard](https://github.com/Rychard).
+ * Moving Jenkins docs to its own file.
+ * Moving issue reporting guidelines to ISSUE_TEMPLATE.
+  
+  [f6e6fe6953e57b6](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/f6e6fe6953e57b6) Tomas Bjerre *2017-01-28 13:45:12*
+
   Optionally HTML encode variables in post content 
 
  * Also adding a .gitattributes to force line endings
   
-  [6c5ea57e189e213](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/6c5ea57e189e213) Tomas Bjerre *2017-01-28 13:24:47*
+  [51f4c6041458893](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/51f4c6041458893) Tomas Bjerre *2017-01-28 13:29:33*
 
 ### No issue
   Use table instead of list for variable documentation
diff --git a/README.md b/README.md
index 8342c513..5bfe6756 100644
--- a/README.md
+++ b/README.md
@@ -219,6 +219,8 @@ You may use Chrome and Developer Tools (press F12) to view rest calls while edit
 
 ## Integration guides
 
+Generally, when working fiddling with this plugin, you may want to use something like [RequestBin](https://requestb.in/). Let the notification URL point to it and you can inspect what the invoked URL looks like.
+
 Here are some guides on how to use the plugin with different systems. Feel free to add guides through pull requests to this repo!
 
  * [Jenkins](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/blob/master/README_jenkins.md)
diff --git a/src/main/resources/admin.vm b/src/main/resources/admin.vm
index 7cfec320..13fb4f0a 100644
--- a/src/main/resources/admin.vm
+++ b/src/main/resources/admin.vm
@@ -471,7 +471,7 @@
 
 
    <h4>URL</h4>
-   <p>The URL to invoke when notification is triggered.</p>
+   <p>The URL to invoke when notification is triggered. You may want to try <a href="https://requestb.in/" target="_blank">RequestBin</a> to fiddle with the plugin settings.</p>
    <fieldset class="group">
     <div class="field-group">
      <label>URL </label>
diff --git a/src/main/resources/pr-triggerbutton.js b/src/main/resources/pr-triggerbutton.js
index d912f041..adaf3b83 100644
--- a/src/main/resources/pr-triggerbutton.js
+++ b/src/main/resources/pr-triggerbutton.js
@@ -45,7 +45,7 @@ define('plugin/prnfb/pr-triggerbutton', [
   var escapedName = _.escape(name);
   var escapedLabel = _.escape(item.label);
   var escapedValue = _.escape(item.defaultValue);
-  var escapedDescription = _.escape(item.defaultDescription);
+  var escapedDescription = _.escape(item.description);
   return $('' +
    '<div class="field-group">' + //
    '<label for="' + name + '">' + escapedLabel + //
@@ -60,7 +60,7 @@ define('plugin/prnfb/pr-triggerbutton', [
   var escapedName = _.escape(name);
   var escapedLabel = _.escape(item.label);
   var escapedValue = _.escape(item.defaultValue);
-  var escapedDescription = _.escape(item.defaultDescription);
+  var escapedDescription = _.escape(item.description);
   return $('' +
    '<div class="field-group">' + //
    '<label for="' + escapedName + '">' + escapedLabel + //