Conflicts:
	VERSION

Removal of gitlab.socket should be in stop function too. Fix #4313

Fix typo.

Issue 3599: Add snippets_enabled flag to projects for API

Fix PostgreSQL database restoration problem (#4217)

Increase snippet content column size.

Update api.js.coffee

project: allow import via git:// url

Remove gitolite repo check for import script

fix bug when project named: mediawiki

Allow SSH keys to be of type ecdsa rather than only rsa and dsa (which are slower, older, and weaker)

Update app/models/key.rb to permit SSH keys of type ecdsa rather than forcing dsa and rsa algorithms.

Conflicts:
	CHANGELOG
	VERSION
	app/views/admin/teams/projects/new.html.haml
	app/views/projects/teams/available.html.haml
	doc/install/installation.md

Fix Pygments 500 error if lexer not found by name