Merge remote-tracking branch 'upstream/release_17.09' into release_18.01

ac46d21e · Dannon Baker · 71b56151 · 40cecf6f · ac46d21e
Commit ac46d21e authored Sep 28, 2018 by Dannon Baker
--- a/lib/galaxy/webapps/galaxy/controllers/root.py
+++ b/lib/galaxy/webapps/galaxy/controllers/root.py
@@ -252,20 +252,6 @@ class RootController(controller.JSAppLauncher, UsesAnnotations):
        else:
            return "No data with id=%d" % id

-    @web.expose
-    def peek(self, trans, id=None):
-        """Returns a 'peek' at the data.
-        """
-        # TODO: unused?
-        # TODO: unencoded id
-        data = trans.sa_session.query(self.app.model.HistoryDatasetAssociation).get(id)
-        if data:
-            yield "<html><body><pre>"
-            yield data.peek
-            yield "</pre></body></html>"
-        else:
-            yield "No data with id=%d" % id
-
    # ---- History management -----------------------------------------------
    @web.expose
    def history_delete(self, trans, id):