summaryrefslogtreecommitdiff
path: root/app/helpers/time_helper.rb
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-06-16 02:24:19 +0300
committerFatih Acet <acetfatih@gmail.com>2016-06-16 02:24:19 +0300
commit14b259fe2b77306ee47de4a6da6d3230e130e9aa (patch)
tree9e37157abd774d885ac839eb147e6fe8cb66b1ff /app/helpers/time_helper.rb
parent2a82684b4780559367a2afba6bb95d28a622ee59 (diff)
parent5d16d50cebb115773c1a16a141adab150eec8764 (diff)
downloadgitlab-ce-14b259fe2b77306ee47de4a6da6d3230e130e9aa.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into long-commit-message-scroll-fix
Diffstat (limited to 'app/helpers/time_helper.rb')
-rw-r--r--app/helpers/time_helper.rb1
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