Merge branch 'release_18.05' into dev

galaxyproject · May 22, 2018 · d47e5f2 · d47e5f2
2 parents a992637 + 440f178
commit d47e5f2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git 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) {

diff --git 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);

diff --git 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
diff --git 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'