From fcde0d669f3e65bf92f05dc517fe550d017c86c4 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Mon, 21 May 2018 12:35:27 -0400
Subject: [PATCH 1/3] Avoid overlapping change handlers

---
 client/galaxy/scripts/mvc/form/form-section.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/galaxy/scripts/mvc/form/form-section.js b/client/galaxy/scripts/mvc/form/form-section.js
index d964dd7d87c..33f75b5e492 100644
--- a/client/galaxy/scripts/mvc/form/form-section.js
+++ b/client/galaxy/scripts/mvc/form/form-section.js
@@ -26,7 +26,8 @@ var View = Backbone.View.extend({
     },
 
     /** Add a new input element */
-    add: function(input_def) {
+    add: function(input) {
+        var input_def = jQuery.extend({}, input);
         input_def.id = Utils.uid();
         this.app.input_list[input_def.id] = input_def;
         switch (input_def.type) {

From 4d38c25c9f746370d9070dfc3d00a488a3b9e27f Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Mon, 21 May 2018 16:16:38 -0400
Subject: [PATCH 2/3] Right align button menu popup

---
 client/galaxy/scripts/mvc/ui/ui-buttons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/galaxy/scripts/mvc/ui/ui-buttons.js b/client/galaxy/scripts/mvc/ui/ui-buttons.js
index 5c1cf2f11d0..3c0fb608d13 100644
--- a/client/galaxy/scripts/mvc/ui/ui-buttons.js
+++ b/client/galaxy/scripts/mvc/ui/ui-buttons.js
@@ -308,7 +308,7 @@ var ButtonMenu = ButtonDefault.extend({
         this.$menu && this.$menu.remove();
         if (this.collection.length > 0) {
             this.$menu = $("<ul/>")
-                .addClass("menu dropdown-menu")
+                .addClass("menu dropdown-menu dropdown-menu-right")
                 .addClass(`pull-${this.model.get("pull")}`)
                 .attr("role", "menu");
             this.$el.append(this.$menu);

From b931356ef3ea6a2b99add6ed180fa81c64b59632 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 22 May 2018 06:24:31 -0400
Subject: [PATCH 3/3] Fix sphinx.

---
 lib/galaxy/dependencies/pipfiles/develop/Pipfile            | 2 +-
 lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock       | 6 +++---
 .../dependencies/pipfiles/develop/pinned-requirements.txt   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/galaxy/dependencies/pipfiles/develop/Pipfile b/lib/galaxy/dependencies/pipfiles/develop/Pipfile
index ce5e26ebb11..a5faf8865d6 100644
--- a/lib/galaxy/dependencies/pipfiles/develop/Pipfile
+++ b/lib/galaxy/dependencies/pipfiles/develop/Pipfile
@@ -19,7 +19,7 @@ selenium = "*"
 testfixtures = "*"
 watchdog = "*"
 pygithub3 = {version = "*", markers = "python_version < '3'"}
-Sphinx = "*"
+Sphinx = "<1.7"  # Docs do not build with sphinx 1.7 for some reason, can't find issue.
 sphinx_rtd_theme = "*"
 lxml = "*"
 recommonmark = "*"
diff --git a/lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock b/lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock
index e95e0b96f08..dd42ce370c2 100644
--- a/lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock
+++ b/lib/galaxy/dependencies/pipfiles/develop/Pipfile.lock
@@ -295,11 +295,11 @@
         },
         "sphinx": {
             "hashes": [
-                "sha256:5a1c9a0fec678c24b9a2f5afba240c04668edb7f45c67ce2ed008996b3f21ae2",
-                "sha256:7a606d77618a753adb79e13605166e3cf6a0e5678526e044236fc1ac43650910"
+                "sha256:832bed0dc6099c2abca957d90ff55bc1a6ec4425c13fc144adbae68a970e3775",
+                "sha256:d5b91b4dad56ffc9f19425ebaa7bc23290a0a2e9035781d5bc54822384663277"
             ],
             "index": "galaxy",
-            "version": "==1.7.2"
+            "version": "==1.6.7"
         },
         "sphinx-rtd-theme": {
             "hashes": [
diff --git a/lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt b/lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt
index d1cc8d071e9..f52de54eb2d 100644
--- a/lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pipfiles/develop/pinned-requirements.txt
@@ -29,7 +29,7 @@ selenium==3.11.0
 six==1.11.0
 snowballstemmer==1.2.1
 sphinx-rtd-theme==0.3.0
-sphinx==1.7.2
+sphinx==1.6.7
 sphinxcontrib-websupport==1.0.1
 testfixtures==6.0.0
 twill==0.9.1; python_version < '3'