Merge branch 'ce-upstream' of gitlab.com:gitlab-org/gitlab-ee into ce-upstream

29554d59 · Dmitriy Zaporozhets · eeaf4d8b · bb056e67 · 29554d59
--- a/features/group_active_tab.feature
+++ b/features/group_active_tab.feature
 Feature: Group Active Tab
-  Background:
-    Given I sign in as "John Doe"
-    And "John Doe" is owner of group "Owned"
-    When I visit group "Owned" settings page
-
-  Scenario: On Audit events
-    When I go to "Audit Events"
-    Then the active sub nav should be Audit Events
-    And no other sub navs should be active
-    And the active main tab should be Settings
-
-  Scenario: On Webhooks
-    When I go to "Webhooks"
-    Then the active sub nav should be Webhooks
-    And no other sub navs should be active
-    And the active main tab should be Settings
-
+#   Background:
+#     Given I sign in as "John Doe"
+#     And "John Doe" is owner of group "Owned"
+#     When I visit group "Owned" settings page
+#
+#   Scenario: On Audit events
+#     When I go to "Audit Events"
+#     Then the active sub nav should be Audit Events
+#     And no other sub navs should be active
+#     And the active main tab should be Settings
+#
+#   Scenario: On Webhooks
+#     When I go to "Webhooks"
+#     Then the active sub nav should be Webhooks
+#     And no other sub navs should be active
+#     And the active main tab should be Settings