delta/gitlab/gitlab-ce.git, branch docs-article-undo-things-in-git

Fix conflict

2017-08-17T19:03:27+00:00

Merge branch 'master' into 'docs-article-undo-things-in-git'

# Conflicts:
#   doc/articles/index.md

Merge branch 'docs/importing-refactor' into 'master'

2017-08-17T14:56:56+00:00

Move workflow/importing/ to user/project/import/

See merge request !13593

Merge branch 'winh-collapsed-sidebar-scrolling' into 'master'

2017-08-17T14:31:02+00:00

Prevent horizontal scrolling in new sidebar when collapsed

Closes #36608 and #36507

See merge request !13638

Move workflow/importing/ to user/project/import/

2017-08-17T14:18:33+00:00

Merge branch '36087-users-cannot-delete-their-account' into 'master'

2017-08-17T14:17:05+00:00

Allow all users to delete their account

Closes #36087

See merge request !13636

Merge branch 'ee-2628-backport-to-ce' into 'master'

2017-08-17T13:53:39+00:00

Backports EE mirror stuck handling feature…

See merge request !13627

Merge branch 'grpc-1.4.5' into 'master'

2017-08-17T13:53:32+00:00

Use grpc 1.4.5

Closes gitaly#468

See merge request !13597

Prevent horizontal scrolling in new sidebar when collapsed

2017-08-17T13:21:46+00:00

Allow all users to delete their account

2017-08-17T12:38:57+00:00

Previously the user could not delete his own account unless signup was
enabled in the global settings. This was due to the fact that deleting
the user would also delete the issues and other items associated to him.
Deleting an user does not destroy essential data anymore, for this
reason we removed the `signup_enabled?` check.

Backports EE mirror stuck handling feature (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE

2017-08-17T12:38:05+00:00