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

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

Hide file tree

Showing 17 changed files with 285 additions and 262 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/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
@@ -43,6 +43,13 @@
     </label>
     <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>

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