CE upstream

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/assets/stylesheets/pages/projects.scss
	both modified:   app/views/shared/_clone_panel.html.haml

@jschatz1 Please resolve these conflicts. 

See merge request !99

[ci skip]

[ci skip]

Doesn't accept null value for max file size on Git hooks

Fixes gitlab-org/gitlab-ce#4664

See merge request !101

Don't show weight in form since it looks silly.

Remove the icon from the form

As discussed in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/88#note_3027598

See merge request !100

Revert vote buttons back to issue and MR pages

https://gitlab.com/gitlab-org/gitlab-ce/issues/3672



/cc @dzaporozhets @JobV 


![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png)


See merge request !2206

Add ability to create a note when blocking a user

https://gitlab.com/gitlab-org/gitlab-ee/issues/18

See merge request !73

Merge branch 'feature/import_kerberos_identities_ad' of https://gitlab.com/cernvcs/gitlab-ee into ee-master

Add Open Graph meta tags



See merge request !2192

Adding  CRIME Vulnerability to Security doc

Added an additional page to the security section that goes over current status and fixes for the TLS Protocol CRIME Vulnerability. Also added its respective link at the security README. 

Any suggestions appreciated @JobV @sytses 

See merge request !2102

Clarify LDAP group sync

This documents LDAP group sync details. When group sync is enabled, non LDAP users will not be removed. They may leave on their own. However, no one can add or remove users manually.

cc/ @balameb @axil 

See merge request !85

Fix URL to GitLab pages documentation in project's setting page



See merge request !92

Fix gitlab.yml.example documentation



See merge request !93

Documentation on CI triggers

Closes #3432

## Notes

* Implement build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/229
* Build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/issues/257
* Build pipeline - https://dev.gitlab.org/gitlab/gitlab-ci/issues/282 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3743
* Dependent builds - https://dev.gitlab.org/gitlab/gitlab-ci/issues/328
* Travis docs - https://docs.travis-ci.com/user/triggering-builds/
* Custom variables Circle CI example - https://circleci.com/docs/nightly-builds
* Triggers API (CI) will be done in a separate MR
* Notify https://gitlab.com/gitlab-org/gitlab-ci/issues/368 once done

## Docs needed to change

- [x] `doc/ci/README.md`
- [x] `doc/README.md`

See merge request !2161

Add API support for looking up a user by username

Needed to support Huboard

See merge request !2089

Require two factor authentication

Allow Admins to force 2FA on their users, as discussed here: gitlab-org/gitlab-ce#3783

See merge request !2155