CE upstream

See merge request !305

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb

GitHub importer refactoring

See merge request !1477

Submit comment on command enter

Fixes #1869.

See merge request !1474

Remove duplicates from group milestone participants list.

See merge request !1473

Gitlab.com integration && Gitlab importer

#1933

See merge request !1456

Fixes #1869.

add editor command to update database.yml; cleanup

Conflicts:
	CHANGELOG

Redirect signup page to signin page.

Resolves #1916.

See merge request !1468

Resolves #1916.

CE into EE

See merge request !303

Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

Disable reserverd project names

Fixes #1550

See merge request !1471

Because since project always belongs to namespace it dont need such
strict restrictions any more

Removes the hard-coded font in the diff notes

Removes the hard-coded font in the diff notes and switches to using the $regular_font variable.

See merge request !259

Fix group search to check path as well as name

The API documentation says:

"You can search for groups by name or path with: /groups?search=Rails"

But you can't because the search query only checks the name, not the path. This fixes that.

See merge request !325

Fix the intermittently failing "Bar" search tests.

Over the past several months we've come to calling them the foobarred tests. We've seen them fail on our jenkins server, and on the GitLab semaphore tests.

In this merge request I scope the test checks for the foo barred tests to check within the .search-results div.

Fixes #567

See merge request !258