GitLab wurde aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Vielen Dank für Ihre Geduld.

Commit 59305715 authored by Robert Speicher's avatar Robert Speicher
Browse files

Remove stamp gem

Closes #5908
parent b1539116
......@@ -67,10 +67,6 @@ gem 'grape', '~> 0.13.0'
gem 'grape-entity', '~> 0.4.2'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Format dates and times
# based on human-friendly examples
gem "stamp", '~> 0.6.0'
# Pagination
gem "kaminari", "~> 0.16.3"
......
......@@ -734,7 +734,6 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
stamp (0.6.0)
state_machines (0.4.0)
state_machines-activemodel (0.3.0)
activemodel (~> 4.1)
......@@ -978,7 +977,6 @@ DEPENDENCIES
spring-commands-spinach (~> 1.0.0)
spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 2.12.3)
stamp (~> 0.6.0)
state_machines-activerecord (~> 0.3.0)
task_list (~> 1.0.2)
teaspoon (~> 1.0.0)
......
......@@ -206,7 +206,7 @@ def time_ago_with_tooltip(time, placement: 'top', html_class: 'time_ago', skip_j
element = content_tag :time, time.to_s,
class: "#{html_class} js-timeago js-timeago-pending",
datetime: time.getutc.iso8601,
title: time.in_time_zone.stamp('Aug 21, 2011 9:23pm'),
title: time.in_time_zone.strftime('%b %-d, %Y %-I:%m%P'), # Aug 1, 2011 9:23pm
data: { toggle: 'tooltip', placement: placement, container: 'body' }
unless skip_js
......
......@@ -121,9 +121,9 @@ def due_date
def expires_at
if due_date
if due_date.past?
"expired at #{due_date.stamp("Aug 21, 2011")}"
"expired at #{due_date.strftime('%b %-d, %Y')}"
else
"expires at #{due_date.stamp("Aug 21, 2011")}"
"expires at #{due_date.strftime('%b %-d, %Y')}"
end
end
end
......
......@@ -112,9 +112,9 @@ def percent_complete
def expires_at
if due_date
if due_date.past?
"expired at #{due_date.stamp("Aug 21, 2011")}"
"expired at #{due_date.strftime('%b %-d, %Y')}"
else
"expires at #{due_date.stamp("Aug 21, 2011")}"
"expires at #{due_date.strftime('%b %-d, %Y')}"
end
end
end
......
......@@ -30,7 +30,7 @@
%li
%span.light Created on:
%strong
= @group.created_at.stamp("March 1, 1999")
= @group.created_at.strftime('%B %-d, %Y')
.panel.panel-default
.panel-heading
......
......@@ -38,7 +38,7 @@
%li
%span.light Created on:
%strong
= @project.created_at.stamp("March 1, 1999")
= @project.created_at.strftime('%B %-d, %Y')
%li
%span.light http:
......
......@@ -4,7 +4,7 @@
%ul.well-list
%li
%span.light Member since
%strong= user.created_at.stamp("Aug 21, 2011")
%strong= user.created_at.strftime('%b %-d, %Y')
- unless user.public_email.blank?
%li
%span.light E-mail:
......
......@@ -58,12 +58,12 @@
%li
%span.light Member since:
%strong
= @user.created_at.stamp("Nov 12, 2031")
= @user.created_at.strftime('%b %-d, %Y')
- if @user.confirmed_at
%li
%span.light Confirmed at:
%strong
= @user.confirmed_at.stamp("Nov 12, 2031")
= @user.confirmed_at.strftime('%b %-d, %Y')
- else
%li
%span.light Confirmed:
......@@ -74,7 +74,7 @@
%span.light Current sign-in at:
%strong
- if @user.current_sign_in_at
= @user.current_sign_in_at.stamp("Nov 12, 2031")
= @user.current_sign_in_at.strftime('%b %-d, %Y')
- else
never
......@@ -82,7 +82,7 @@
%span.light Last sign-in at:
%strong
- if @user.last_sign_in_at
= @user.last_sign_in_at.stamp("Nov 12, 2031")
= @user.last_sign_in_at.strftime('%b %-d, %Y')
- else
never
......
......@@ -10,7 +10,7 @@
%strong= @key.title
%li
%span.light Created on:
%strong= @key.created_at.stamp("Aug 21, 2011")
%strong= @key.created_at.strftime('%b %-d, %Y')
.col-md-8
%p
......
......@@ -6,7 +6,7 @@
.col-md-2.hidden-xs.hidden-sm
%h5.commits-row-date
%i.fa.fa-calendar
%span= day.stamp("28 Aug, 2010")
%span= day.strftime('%d %b, %Y')
.light
= pluralize(commits.count, 'commit')
.col-md-10.col-sm-12
......
......@@ -21,7 +21,7 @@
%span
#{@user.bio}.
%span
Member since #{@user.created_at.stamp("Aug 21, 2011")}
Member since #{@user.created_at.strftime('%b %d, %Y')}
.cover-desc
- unless @user.public_email.blank?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment