Update the init.d file to the correct locationof the example defaults file
Update the example defaults, include the rest of he variables
Better check on the validity of emails

At this moment it was possible to enter emails like:
mailto:info@example.com. This was causing some issue in the frontend,
since those links became html mailto: links.

Fixes: #3516
Add IRC nicknames to channel admins
Update select branch to GitLab look and explain why this guide is long so people are not discouraged.
Add website url to user
Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user

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

Conflicts:
	CHANGELOG
Merge branch 'jeromedalbert-add_website_url_to_user'
Merge pull request #6072 from jvanbaarsen/fix-3516

Better check on the validity of emails
Merge branch 'init.d' of /mnt/ebs/repositories/arifali1/gitlab-ce
Add EE checkout instructions to update docs
Better wording of the import instructions.
 Merge branch 'ee_update_instructions' into 'master'

Add EE checkout instructions to update docs
Merge pull request #6078 from sag47/irc_nicknames

Add IRC nicknames to channel admins
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Update kaminari

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Revert "Since the git clone code is more efficient now we do not need this warning anymore."

This reverts commit a757c4a24f110aa25ad36dd347d499cf859e4d0d.

While it is true that Grack memory use while sending data to a client
was improved, this does not change the fact that the Git processes
running on a GitLab server will use more memory for large repositories.
 Merge branch 'cloning_is_still_the_same' into 'master'

Git clone performance is still the same
Dont override project_id params when use issues/mr filtering

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix assign-to-me link for MR form

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 Merge branch 'import-doc' into 'master'

Import Doc