Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index 205106afddb..50ac90cb449 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -481,6 +481,11 @@ module Gitlab
       "can contain only lowercase letters, digits, '_' and '-'. " \
       "Must start with a letter, and cannot end with '-' or '_'"
     end
+
+    # One or more `part`s, separated by separator
+    def sep_by_1(separator, part)
+      %r(#{part} (#{separator} #{part})*)x
+    end
   end
 end
 
diff --git a/lib/sidebars/groups/menus/customer_relations_menu.rb b/lib/sidebars/groups/menus/customer_relations_menu.rb
index 0aaa6ec45f1..e0772cfe403 100644
--- a/lib/sidebars/groups/menus/customer_relations_menu.rb
+++ b/lib/sidebars/groups/menus/customer_relations_menu.rb
@@ -35,7 +35,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Contacts'),
             link: group_crm_contacts_path(context.group),
-            active_routes: { path: 'groups/crm#contacts' },
+            active_routes: { controller: 'groups/crm/contacts' },
             item_id: :crm_contacts
           )
         end
@@ -44,7 +44,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Organizations'),
             link: group_crm_organizations_path(context.group),
-            active_routes: { path: 'groups/crm#organizations' },
+            active_routes: { controller: 'groups/crm/organizations' },
             item_id: :crm_organizations
           )
         end