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