kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec
History
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
..
bin DRY up the specs for bin/changelog 2016-11-03 17:35:06 +00:00
config Make mail_room idle_timeout option configurable. 2016-11-16 12:46:37 +01:00
controllers Updated code based on feedback 2016-11-21 17:29:07 +01:00
factories Introduce deploy command that allows to start deployment from one environment to second one 2016-11-21 17:26:35 +01:00
features Merge branch '20840-getting-started-better-empty-state-for-issues-view' into 'master' 2016-11-22 02:24:23 +00:00
finders Precalculate user's authorized projects in database 2016-11-18 20:25:45 +02:00
fixtures add parsing support for incoming html email 2016-11-17 11:59:44 +09:00
helpers Use `Gitlab.config.gitlab.host` over `'localhost'` 2016-11-18 20:17:10 +08:00
initializers
…
javascripts Merge branch 'backport-tt' into 'master' 2016-11-22 02:46:19 +00:00
lib Merge branch 'improve-deploy-message' into 'master' 2016-11-21 21:53:39 +00:00
mailers Use `Gitlab.config.gitlab.host` over `'localhost'` 2016-11-18 20:17:10 +08:00
models Merge branch 'chatops-deploy-command' into 'master' 2016-11-21 20:27:58 +00:00
policies Added tests for IssuePolicy 2016-11-07 12:49:24 +01:00
requests Merge branch 'feature/send-registry-address-with-build-payload' into 'master' 2016-11-21 20:22:55 +00:00
routing Fix 500 error when group name ends with git 2016-11-21 21:03:18 +02:00
serializers Bring back the `commit_url` as it's used by CycleAnalytics 2016-11-18 22:31:26 +01:00
services Merge branch 'hide-empty-merge-request-diffs' into 'master' 2016-11-21 19:23:22 +00:00
support Merge branch 'issue_5541' into 'master' 2016-11-21 11:07:46 +00:00
tasks/gitlab Introduce better credential and error checking to `rake gitlab:ldap:check` 2016-11-08 15:46:10 -06:00
uploaders
…
views Merge branch '23205-information-about-environments-build-page' into 'master' 2016-11-18 15:49:19 +00:00
workers Refactor cache refreshing/expiring 2016-11-21 15:05:13 +01:00
factories_spec.rb
…
rails_helper.rb
…
rake_helper.rb Add Rake task to create/repair GitLab Shell hooks symlinks 2016-11-01 14:52:59 -05:00
simplecov_env.rb
…
spec_helper.rb Refine specs for build show page with environments 2016-11-09 19:40:25 +01:00
teaspoon_env.rb
…