GitLab CE 6.7.0.rc1

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb

Fix group edit in admin area

Fixes #76

Strangly, the buttons were pushed out of the form. By including them in the fieldset of the second part of form, the layout doesn't change, but the buttons are nested within the form and are functional again.

Wording Of Pre Receive Hooks

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Git Hooks

Merge branch 'username-keys-content-type' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

Recursive LDAP groups (ActiveDirectory only)

Replace gemoji with open source PhantomOpenEmoji

Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.

6 6 Ce To Ee Update Guide

6.6-CE to EE wasn't yet in the repository, so seemed like a good idea to add it.

Other than the branch, there are no changes.

/cc @jacobvosmaer

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Cloud Update

/cc @jacobvosmaer @marin @job

Oauth Require Public Email

Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.

Deploy Key Doc

/cc @marin @job @jacobvosmaer

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Changelog O'Reilly

added "Better API for access_levels" sponsorship from O'Reilly to CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Git Refactoring

Pull/Push refactoring. Must be ported to CE too.

Requires https://dev.gitlab.org/gitlab/gitlab-shell/merge_requests/26

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Git Refactoring

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>