Conflicts:
	app/assets/stylesheets/generic/nav_sidebar.scss

Group controllers refactoring

Usefulness of this refactoring is not so obvious on CE codebase. But It will allow us to remove huge amount of code on the EE side.

See merge request !1684

Allow smb:// links in Markdown text.

As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184

See merge request !1669

Update html-pipeline and emoji

See merge request !1680

Conflicts:
	Gemfile.lock

add AMI update step

See merge request !1677

Remove annoying notice messages when create/update merge request

See merge request !1681

Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues

For gitlab/gitlab_git!24

See merge request !1679

 Fix code preview theme setting for comments, issues, merge requests, and snippets

User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme.

Closes #1139

See merge request !357

Escape wildcards when searching LDAP by username.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2086.

Also see https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/344 and https://dev.gitlab.org/gitlab/omniauth-ldap/merge_requests/2.

See merge request !1644

Remove placeholder methods to prevent calling methods rather than attributes.

Since we have https://dev.gitlab.org/gitlab/gitlabhq/blob/7-8-stable/app/models/service.rb#L79 makes no sense to have methods as a placeholder.

See merge request !1676

Dashboard restyle

For #2069

See merge request !1675

Generate valid json

This patch helps to be compatible to other programing languages as it improves the validation of hook data. It seems only ruby can handle 'nil' as value while other json decode function will fatal.

See merge request !182

Make email display name configurable

#216

See merge request !80

Fix features checkboxes at admin settings page

For !1615

See merge request !1674

Active users check

For gitlab/gitlab-ee#248

See merge request !1673