Merge branch 'time-tracking-integration' of gitlab.com:gitlab-org/gitlab-ee into time-tracking-integration

Conflicts:
	db/schema.rb

Also added new attributes related to time tracking to the JSON payload.

[ci skip]

[ci skip]

[ci skip]

[ci skip]

Add a note about LDAP nested group resolution.

For LDAP sync, nested groups must fall within the configured
`group_base`. A customer recently ran in to this issue. It's
not immediately obvious but at least we can make a note in the
documentation.

See merge request !872

For LDAP sync, nested groups must fall within the configured
`group_base`. A customer recently ran in to this issue. It's
not immediately obvious but at least we can make a note in the
documentation.

[ci skip]

[ci skip]

[ci skip]

[ci skip]

CE upstream

See merge request !871

CE upstream

See merge request !867

Issue #13823: random message when all Todos are Done

## What does this MR do?

Shows a random message every time the To Do list is empty: https://gitlab.com/gitlab-org/gitlab-ce/issues/13823

## Are there points in the code the reviewer needs to double check?

It's my first contribution to GitLab so I might need some help:

 - I'm loading a yaml file in the controller. I'm not sure where would be the best place to put it.
 - I'm also having the error below running the tests but it doesn't seem related to my changes. I think I might have some issue with my config. Could you double check if the tests pass for you?

/home/pep/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call': No route matches [GET] "/autocomplete/users/sjobs@apple.com.json" (ActionController::RoutingError)

## Why was this MR needed?

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

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

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

See merge request !6818

Fix gitlab:elastic:index_wiki

Closes #1244

See merge request !868

21778 Correct css styles for pinned navigation

## What does this MR do?
Fixes css for header and comment notes when sidebar is pinned

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-11-08_at_11.02.55_AM](/uploads/ae7bb1f477b2ffbd4d4e0364f2770816/Screen_Shot_2016-11-08_at_11.02.55_AM.png)
After:
![Screen_Shot_2016-11-08_at_11.02.34_AM](/uploads/cf0b9f9f175aa5c6c7e79640b76b1040/Screen_Shot_2016-11-08_at_11.02.34_AM.png)

Before:
![Screen_Shot_2016-11-08_at_11.03.21_AM](/uploads/f48ea742ee6dbb86874e47dd27eddadd/Screen_Shot_2016-11-08_at_11.03.21_AM.png)
After:
![Screen_Shot_2016-11-08_at_11.02.19_AM](/uploads/312b27ba07e04ceb96f8ed9d6f167bee/Screen_Shot_2016-11-08_at_11.02.19_AM.png)
## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
Closes #21778 

cc @mikegreiling

See merge request !7362