Remove r channel from more locations

doc/source/admin/dependency_resolvers.rst

@@ -220,7 +220,7 @@ debug
 ensure_channels
     conda channels to enable by default. See
     http://conda.pydata.org/docs/custom-channels.html for more
-    information about channels. This defaults to ``iuc,bioconda,conda-forge,defaults,r``.
+    information about channels. This defaults to ``iuc,bioconda,conda-forge,defaults``.
     This order should be consistent with the `Bioconda prescribed order <https://github.com/bioconda/bioconda-recipes/blob/master/config.yml>`__
     if it includes ``bioconda``.
 

lib/galaxy/tools/deps/mulled/mulled_build.py

@@ -30,7 +30,7 @@ from ..conda_compat import MetaData
 
 DIRNAME = os.path.dirname(__file__)
 DEFAULT_CHANNEL = "bioconda"
-DEFAULT_EXTRA_CHANNELS = ["conda-forge", "r"]
+DEFAULT_EXTRA_CHANNELS = ["conda-forge"]
 DEFAULT_CHANNELS = [DEFAULT_CHANNEL] + DEFAULT_EXTRA_CHANNELS
 DEFAULT_REPOSITORY_TEMPLATE = "quay.io/${namespace}/${image}"
 DEFAULT_BINDS = ["build/dist:/usr/local/"]