gitlab-org--gitlab-foss/app
Jacob Schatz 56b420ae10 Merge branch 'backport-tt' into 'master'
Backport SmartInterval, PrettyTime, SubbableResource from EE.

## What does this MR do?

Backports infrastructure used for EE-only Timetracking so it can be used and improved upon in CE. 

This doesn't really need review... it was already reviewed and merged in EE. 

There are no side effects or conflicts, just three new classes added:

1. `SubbableResource` -- pubsub for ajax resources
2. `SmartInterval`-- for configurable polling
3. `PrettyTime` -- time parsing and formatting utility methods

- [x] Added for this feature/bug
- [x] 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-ee/issues/985

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/870

cc: @jschatz1

See merge request !7573
2016-11-22 02:46:19 +00:00
..
assets Merge branch 'backport-tt' into 'master' 2016-11-22 02:46:19 +00:00
controllers Merge branch '23449-cycle-analytics-2-frontend' into 'master' 2016-11-22 00:16:13 +00:00
finders Limit labels returned for a specific project as an administrator 2016-11-16 15:04:51 +02:00
helpers Merge branch '18136-ui-for-restricting-global-visibility-levels-is-unclear' into 'master' 2016-11-22 02:34:24 +00:00
mailers Merge remote-tracking branch 'upstream/master' into pipeline-notifications 2016-11-08 23:52:17 +08:00
models Merge branch 'chatops-deploy-command' into 'master' 2016-11-21 20:27:58 +00:00
policies Merge branch 'pipeline-notifications' into 'master' 2016-11-09 13:41:04 +00:00
serializers Merge branch 'ee-870-backport' into 'master' 2016-11-21 12:54:55 +00:00
services Merge branch 'hide-empty-merge-request-diffs' into 'master' 2016-11-21 19:23:22 +00:00
uploaders
validators
views Merge branch '18136-ui-for-restricting-global-visibility-levels-is-unclear' into 'master' 2016-11-22 02:34:24 +00:00
workers Refactor cache refreshing/expiring 2016-11-21 15:05:13 +01:00