Merge branch 'fix/project-wiki-ending' into 'master'

Fix for project paths ending in .wiki

This prevents `Git operation was rejected by pre-receive hook` when
an actual project ending with .wiki is thought to be a wiki by the
`Internal` API.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13742

See merge request !2960

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index 8d0ae1475c2..22802dd0e05 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -54,6 +54,18 @@ describe API::API, api: true  do
         project.team << [user, :developer]
       end
 
+      context "git push with project.wiki" do
+        it 'responds with success' do
+          project_wiki = create(:project, name: 'my.wiki', path: 'my.wiki')
+          project_wiki.team << [user, :developer]
+
+          push(key, project_wiki)
+
+          expect(response.status).to eq(200)
+          expect(json_response["status"]).to be_truthy
+        end
+      end
+
       context "git pull" do
         it do
           pull(key, project)