Revert "gitlab shell works if multiple rubies installed"

This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944.

1 files changed, 14 insertions, 12 deletions

diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature
index 7442145d87e..d9fbb875c28 100644
--- a/features/project/forked_merge_requests.feature
+++ b/features/project/forked_merge_requests.feature
@@ -11,18 +11,20 @@ Feature: Project Forked Merge Requests
     And I submit the merge request
     Then I should see merge request "Merge Request On Forked Project"
 
-  @javascript
-  Scenario: I can edit a forked merge request
-    Given I visit project "Forked Shop" merge requests page
-    And I click link "New Merge Request"
-    And I fill out a "Merge Request On Forked Project" merge request
-    And I submit the merge request
-    And I should see merge request "Merge Request On Forked Project"
-    And I click link edit "Merge Request On Forked Project"
-    Then I see the edit page prefilled for "Merge Request On Forked Project"
-    And I update the merge request title
-    And I save the merge request
-    Then I should see the edited merge request
+  # TODO: Improve it so it does not fail randomly
+  #
+  #@javascript
+  #Scenario: I can edit a forked merge request
+    #Given I visit project "Forked Shop" merge requests page
+    #And I click link "New Merge Request"
+    #And I fill out a "Merge Request On Forked Project" merge request
+    #And I submit the merge request
+    #And I should see merge request "Merge Request On Forked Project"
+    #And I click link edit "Merge Request On Forked Project"
+    #Then I see the edit page prefilled for "Merge Request On Forked Project"
+    #And I update the merge request title
+    #And I save the merge request
+    #Then I should see the edited merge request
 
   @javascript
   Scenario: I cannot submit an invalid merge request