diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-06 17:27:56 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-07 20:01:08 -0500 |
commit | fa36749bcee7fa2eb72c9f2a6a28aab1b7274097 (patch) | |
tree | ce7eb20119e69fac8cb41f35dd059599b4e71817 /app/views | |
parent | 59305715e9d3569f47d7c2accc2106022c0a6960 (diff) | |
download | gitlab-ce-fa36749bcee7fa2eb72c9f2a6a28aab1b7274097.tar.gz |
Add two custom Date/Time conversion formats
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/groups/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/projects/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/users/_profile.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/users/show.html.haml | 8 | ||||
-rw-r--r-- | app/views/profiles/keys/_key_details.html.haml | 2 | ||||
-rw-r--r-- | app/views/users/show.html.haml | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index ef57f51d811..f7fd156b84a 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -30,7 +30,7 @@ %li %span.light Created on: %strong - = @group.created_at.strftime('%B %-d, %Y') + = @group.created_at.to_s(:medium) .panel.panel-default .panel-heading diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 9c3e6ce3214..0c986af4a95 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -38,7 +38,7 @@ %li %span.light Created on: %strong - = @project.created_at.strftime('%B %-d, %Y') + = @project.created_at.to_s(:medium) %li %span.light http: diff --git a/app/views/admin/users/_profile.html.haml b/app/views/admin/users/_profile.html.haml index 26f01c0df04..6bc217f84cc 100644 --- a/app/views/admin/users/_profile.html.haml +++ b/app/views/admin/users/_profile.html.haml @@ -4,7 +4,7 @@ %ul.well-list %li %span.light Member since - %strong= user.created_at.strftime('%b %-d, %Y') + %strong= user.created_at.to_s(:medium) - unless user.public_email.blank? %li %span.light E-mail: diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 5d8601c4668..2c2450d4117 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -58,12 +58,12 @@ %li %span.light Member since: %strong - = @user.created_at.strftime('%b %-d, %Y') + = @user.created_at.to_s(:medium) - if @user.confirmed_at %li %span.light Confirmed at: %strong - = @user.confirmed_at.strftime('%b %-d, %Y') + = @user.confirmed_at.to_s(:medium) - 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.strftime('%b %-d, %Y') + = @user.current_sign_in_at.to_s(:medium) - else never @@ -82,7 +82,7 @@ %span.light Last sign-in at: %strong - if @user.last_sign_in_at - = @user.last_sign_in_at.strftime('%b %-d, %Y') + = @user.last_sign_in_at.to_s(:medium) - else never diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml index 35624908e82..3bd1f1af162 100644 --- a/app/views/profiles/keys/_key_details.html.haml +++ b/app/views/profiles/keys/_key_details.html.haml @@ -10,7 +10,7 @@ %strong= @key.title %li %span.light Created on: - %strong= @key.created_at.strftime('%b %-d, %Y') + %strong= @key.created_at.to_s(:medium) .col-md-8 %p diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 814ba146602..ce17fc7bca1 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -21,7 +21,7 @@ %span #{@user.bio}. %span - Member since #{@user.created_at.strftime('%b %d, %Y')} + Member since #{@user.created_at.to_s(:medium)} .cover-desc - unless @user.public_email.blank? |