Merge branch 'master' into fe-commit-mr-pipelines

* master: (76 commits)
  fix failing test
  fix Vue warnings for missing element
  [ci skip] UX Guide: Button placement in groups
  Change window size before visiting page, to get correct scroll position
  Fix slash commands spec error
  Move project services to new location under Integrations
  Move webhooks to new a location under Integrations
  Fixed redirection from http://someproject.git to http://someproject
  consistently use single quotes
  allow application.js to require other scripts which start with application*
  DRY with Gitlab.config.webpack.dev_server references
  disable webpack proxy in rspec environment due to conflicts with webmock gem
  remove changes to Procfile
  configure webpack dev server port via environment variable
  add rack middleware to proxy webpack dev server
  remove dev-server config from development environment
  Document that the retro and kickoff notes are public
  add CHAGELOG.md entry for webpack branch
  fix failing rspec build
  fix test failure for merge request widget
  ...

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 9323f723bdb..e7aa8745b99 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -213,6 +213,17 @@ describe ProjectsController do
         expect(response.status).to eq 404
       end
     end
+
+    context "redirection from http://someproject.git" do
+      it 'redirects to project page (format.html)' do
+        project = create(:project, :public)
+
+        get :show, namespace_id: project.namespace.path, id: project.path, format: :git
+
+        expect(response).to have_http_status(302)
+        expect(response).to redirect_to(namespace_project_path)
+      end
+    end
   end
 
   describe "#update" do