Update changelog

keep in mind that there is unmerged MR without updating changelog https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/268

See merge request !269

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

CE changes from upstream

See merge request !266

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

Fix/project show also ldap users

In 336b7b87 a feature was (silently) added which broke our use case of using LDAP synced groups as a common base for user <-> project mapping 😒

Although
>v 7.4.0
>  - [...]
>  - Do not show ldap users in dropdowns for groups with enabled ldap-sync
>  - [...]

indicates that the drop down boxes for groups have changed, it does not for projects in such a group. To be clear: It totally makes sense to not manually manage users for LDAP synced groups, on a project basis however it is very useful and an essential feature to allow self-service in organizations.

Please consider making the `skip_ldap` flag optional for the dropdown boxes.
[Also, make sure that the provider you're excluding actually is called `ldap`, which might not be the case for installations with multiple LDAP backends.](https://gitlab.com/subscribers/gitlab-ee/blob/master/lib/api/users.rb#L16)

This MR is a quick fix to disable this feature for projects.

See merge request !25

Fix syntax in documentation of ldap config

See merge request !265

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

Conflicts:
	db/schema.rb

Hide ldap group links if ldap is not enabled

This MR also includes a fix for next issue: prevent 500 error on ldap group links page if group has links to ldap servers that are disabled or removed from gitlab config.

Fixes #196

See merge request !264

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

Dropdown icon not clickable

Fixes #1642 by using `pointer-events` property supported by [modern browsers](http://caniuse.com/#search=pointer-events)

See merge request !1319

Show files named diff

Fixes #1749

See merge request !1318

Add an extra reference to the 'shell commands' guide

The 'shell commands' guide now also has tips on opening/reading files and handling paths.

See merge request !1321

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

Enable Markdown preview for issues, merge requests, milestones, and notes

Add security tips about file and paths

These are some extra guidelines to guard against code execution and path traversal.

See merge request !1317

Updated doc/integration/twitter.md, fixed incorrect callback URL

Fixed a typo in the Integration instructions for Twitter OAuth

See merge request !257

(referencing /users/auth/github/callback,
 not /users/auth/twitter/callback)

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

Speed up omniauth AddIdentityTable migration

https://dev.gitlab.org/gitlab/gitlabhq/issues/1810

See merge request !1315

If group has links to ldap servers that are disabled or removed from
gitlab config.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Unicorn workers

See merge request !1316

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

Unicorn advice

See merge request !1314

Add 'grace time' behavior to Sidekiq MemoryKiller

The previous iteration of the memory killer did not give 'large'
jobs much of a chance to finish. This caused them to come back after
each restart, leading to another memory-induced shutdown. By adding
some 'grace time' between the moment we detect a memory peak and
the moment we start shutting down, we hope to give Sidekiq a chance
to get whatever causes its memory to grow 'out of its system'.

See merge request !1313