diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-14 16:23:16 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-06-14 16:23:16 +0200 |
| commit | 9413d1c2e9c4cebe32921f6e403cf496e3ec8c58 (patch) | |
| tree | ac829f9a9bb88f4e6ca36ef071005ea5c2088336 /app/helpers/time_helper.rb | |
| parent | 515205d3c1c6655302ed0ae44cc5954dead7ae79 (diff) | |
| parent | d4cd6dcaa024f8eca9089e67fb9b97022696d3e0 (diff) | |
| download | gitlab-ce-9413d1c2e9c4cebe32921f6e403cf496e3ec8c58.tar.gz | |
Merge branch 'master' into 13948-access-request-to-projects-and-groups
# Conflicts:
# app/views/layouts/nav/_project.html.haml
Diffstat (limited to 'app/helpers/time_helper.rb')
| -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 |