From 40cc1c7d0688f8aa1f8ef770b679cf6449067352 Mon Sep 17 00:00:00 2001
From: "Lennart C. L. Kats" <lclkats@gmail.com>
Date: Tue, 29 Mar 2016 15:22:56 +0200
Subject: [PATCH] Revert "Fix, help debug workspace creation issues"

---
 node_modules/c9/rest_client.js                 | 6 +-----
 plugins/c9.ide.dialog.common/alert_internal.js | 2 --
 plugins/c9.vfs.client/endpoint.js              | 4 ----
 plugins/c9.vfs.client/vfs_client.js            | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/node_modules/c9/rest_client.js b/node_modules/c9/rest_client.js
index 8631edf5..8f42b1d0 100644
--- a/node_modules/c9/rest_client.js
+++ b/node_modules/c9/rest_client.js
@@ -44,11 +44,7 @@ function RestClient(host, port, config) {
             port: port,
             path: path,
             method: method,
-            headers: headers,
-            timeout: config.timeout || 60 * 1000,
-            pool: config.pool || {
-                maxSockets: 100000,
-            },
+            headers: headers
         };
         if (config.username)
             options.auth = config.username + ":" + config.password;
diff --git a/plugins/c9.ide.dialog.common/alert_internal.js b/plugins/c9.ide.dialog.common/alert_internal.js
index 042b3277..572c48ad 100644
--- a/plugins/c9.ide.dialog.common/alert_internal.js
+++ b/plugins/c9.ide.dialog.common/alert_internal.js
@@ -42,8 +42,6 @@ define(function(require, module, exports) {
                     .replace(/\n/g, "<br />")
                     .replace(/(https?:\/\/[^\s]*\b)/g, "<a href='$1' target='_blank'>$1</a>");
                 
-                plugin.getElement("ok").setCaption(options.yes || "OK");
-                
                 plugin.update([
                     { id: "dontshow", visible: options && options.showDontShow }
                 ]);
diff --git a/plugins/c9.vfs.client/endpoint.js b/plugins/c9.vfs.client/endpoint.js
index 59197dc9..c90ff5e3 100644
--- a/plugins/c9.vfs.client/endpoint.js
+++ b/plugins/c9.vfs.client/endpoint.js
@@ -225,10 +225,6 @@ define(function(require, exports, module) {
                             callback(fatalError(res.error.message, "dashboard"));
                             return;
                         }
-                        else if (err.code == 404) {
-                            callback(fatalError("This workspace no longer appears to exist or failed to be created.", "dashboard"));
-                            return;
-                        }
                         else if (err.code === 428 && res.error) {
                             emit("restore", {
                                 projectState: res.error.projectState,
diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 0f07d9b4..9e11a4d0 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -253,7 +253,7 @@ define(function(require, exports, module) {
                         err.message = "SSH permission denied. Please review your workspace configuration.";
                     return showAlert("Workspace Error", "Unable to access your workspace", err.message, function() {
                         window.location = dashboardUrl;
-                    }, { yes: "Return to dashboard" });
+                    });
                 case "reload":
                     lastError = showError(err.message + ". Please reload this window.", -1);
                     setTimeout(function() {