CE upstream

CE changes https://gitlab.com/gitlab-org/gitlab-ce/compare/d636efbe26ee51030bb108d889c2ef867570358a...0c36b810abede73b3cf59f951e7467dbac54ec98?expand_all_diffs=1

spec/routing/routing_spec.rb

@@ -266,13 +266,13 @@
   end
   it "also display group#show on the short path" do
-    allow(Group).to receive(:find_by_path).and_return(true)
+    allow(Group).to receive(:find_by).and_return(true)
     expect(get('/1')).to route_to('groups#show', id: '1')
   end
   it "also display group#show with dot in the path" do
-    allow(Group).to receive(:find_by_path).and_return(true)
+    allow(Group).to receive(:find_by).and_return(true)
     expect(get('/group.with.dot')).to route_to('groups#show', id: 'group.with.dot')
   end