diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 16:19:29 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 16:19:29 +0200 |
| commit | 006b65098806fde2a467d9a79347d2978c992e89 (patch) | |
| tree | 344377e66de454b7be77f775cd37fcf41e0f6bc0 /app/helpers | |
| parent | dc41a933f4f9a79e7160e38f248d33d7beb99bb6 (diff) | |
| parent | d4cd6dcaa024f8eca9089e67fb9b97022696d3e0 (diff) | |
| download | gitlab-ce-006b65098806fde2a467d9a79347d2978c992e89.tar.gz | |
Merge remote-tracking branch 'origin/master' into environments-and-deployments
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/time_helper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb index 8142f733e76..b04b0a5114c 100644 --- a/app/helpers/time_helper.rb +++ b/app/helpers/time_helper.rb @@ -20,7 +20,6 @@ module TimeHelper end end - def date_from_to(from, to) "#{from.to_s(:short)} - #{to.to_s(:short)}" end |