feat(default-merge-strategy): choose default merge strategy (#91)

Choose either "Merge commit" or "Squash" as the default merge strategy for pull requests in the Options page Closes issue #90
refined-bitbucket · Dec 8, 2017 · aa0a56f · aa0a56f
1 parent c94e7ee
commit aa0a56f
Show file tree

Hide file tree

Showing 18 changed files with 284 additions and 264 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Next Version
 
+### Features:
+
+* **Default-merge-strategy**: Choose either "Merge commit" or "Squash" as the default merge strategy for pull requests in the Options page, closes [issue #90](https://github.com/refined-bitbucket/refined-bitbucket/issues/90), [pull request #91](https://github.com/refined-bitbucket/refined-bitbucket/pull/91).
+
 ### Improvements:
 
 * **General**: Added checkboxes in the Options page to allow the user to opt-in / opt-out of each feature of the extension individually, closes [issue #86](https://github.com/refined-bitbucket/refined-bitbucket/issues/86), [pull request #87](https://github.com/refined-bitbucket/refined-bitbucket/pull/87).

diff --git a/README.md b/README.md
@@ -33,15 +33,14 @@ We all know BitBucket lacks some features that we have in other platforms like G
 	<tr>
 		<th width="50%">
 			The Options page.<br>
-			Showcasing <em>autocollapse</em> and <em>pullrequest-ignore</em> features configuration.
 		</th>
 		<th width="50%">
 			<em>pullrequest-ignore</em> and <em>load-all-diffs</em>
 		</th>
 	</tr>
 	<tr>
 		<td rowspan="2">
-			<img src="https://user-images.githubusercontent.com/7514993/32203196-166bd1ca-bdb8-11e7-82ca-5836780992e3.png" alt="options">
+			<img src="https://user-images.githubusercontent.com/7514993/33744735-1f66115c-db89-11e7-804c-9739d3619c65.png" alt="options">
 		</td>
 		<td>
 			<strong>pullrequest-ignore</strong><br>

diff --git a/extension/manifest.json b/extension/manifest.json
@@ -27,9 +27,6 @@
     {
       "js": [
         "prism.js",
-        "vendor/jquery-3.1.0.min.js",
-        "vendor/jquery.highlight.js",
-        "vendor/mousetrap.min.js",
         "main.js"
       ],
       "matches": [

diff --git a/extension/options.html b/extension/options.html
@@ -44,6 +44,13 @@
     <br>
     <br>
 
+    <label> Default Merge Strategy </label>
+    <form id="default-merge-strategy-form" style="margin: 0.5em 0 0 1em;">
+        <input type="radio" name="default-merge-strategy" value="merge_commit" checked> Merge commit
+        <input type="radio" name="default-merge-strategy" value="squash"> Squash
+    </form>
+    <br>
+
     <div>
         <div>
             <label>

diff --git a/extension/vendor/jquery-3.1.0.min.js b/extension/vendor/jquery-3.1.0.min.js
diff --git a/extension/vendor/jquery.highlight.js b/extension/vendor/jquery.highlight.js
diff --git a/extension/vendor/mousetrap.min.js b/extension/vendor/mousetrap.min.js