diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-09 09:53:24 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-09 09:53:24 +0000 |
| commit | cf76776d03885c02b58df07dbca42bc455f4a841 (patch) | |
| tree | 9a69192ea7604268c596cafd7b4f8e93608483d7 /spec/controllers | |
| parent | 796bdf1dcb86b5e77fc054208afc632f75518605 (diff) | |
| parent | 76c7b83dd5e345583fbaa26d9462a1bec7107a60 (diff) | |
| download | gitlab-ce-cf76776d03885c02b58df07dbca42bc455f4a841.tar.gz | |
Merge branch 'sidekiq-ps-parsing' into 'master'
* Moves splitting of `ps` result to helper.
* Users a regexp to extract the different parts
The result of `ps` at least depends on the _LANG_ and the distance of
_start_ to _now_ (start time then the day + hour then month+day)
I've tested with _LANG=en_US.UTF-8_ and _LANG=de_CH.UTF-8_
Closes #20632
See merge request !6245
Diffstat (limited to 'spec/controllers')
0 files changed, 0 insertions, 0 deletions