Unverified Commit d5252721 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_22.01' into release_22.05

parents eca42d92 a03856c8

config/plugins/visualizations/jqplot/jqplot_bar/src/script.js

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ window.bundleEntries.jqplot_box = function (options) { 
            chart               : options.chart,

            dataset_id          : dataset.id,

            dataset_groups      : dataset_groups,

            targets             : options.targets,

            target              : options.target,

            makeConfig          : function( groups, plot_config ){

                var boundary = getDomains( groups, 'x' );

                $.extend( true, plot_config, {

lib/galaxy/webapps/galaxy/api/__init__.py

+1 −3
Original line number Diff line number Diff line
@@ -207,9 +207,7 @@ class GalaxyASGIRequest(GalaxyAbstractRequest): 


    @property

    def host(self) -> str:

        client = self.__request.client

        assert client is not None

        return str(client.host)

        return self.__request.base_url.netloc





class GalaxyASGIResponse(GalaxyAbstractResponse):