summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2013-10-22 11:38:15 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2013-10-23 10:15:08 +0900
commit03dec79c74f8f067258f26ed2cacc6353e9be401 (patch)
treebd2a3944970ba7ce863defc3a4554533dfadaa9a
parentc2084639df00a93d3568c89244e48cb79075471f (diff)
downloadgitlab-ce-03dec79c74f8f067258f26ed2cacc6353e9be401.tar.gz
Fix some more instances of "Created at"
"Created on" should be used when the timestamp is only a date.
-rw-r--r--app/views/admin/groups/show.html.haml2
-rw-r--r--app/views/profiles/keys/show.html.haml2
-rw-r--r--app/views/projects/merge_requests/show/_mr_box.html.haml2
-rw-r--r--app/views/projects/show.html.haml2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 1566c345809..ca51a57000a 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -25,7 +25,7 @@
= @group.description
%li
- %span.light Created at:
+ %span.light Created on:
%strong
= @group.created_at.stamp("March 1, 1999")
diff --git a/app/views/profiles/keys/show.html.haml b/app/views/profiles/keys/show.html.haml
index b736ab17087..2852c338af2 100644
--- a/app/views/profiles/keys/show.html.haml
+++ b/app/views/profiles/keys/show.html.haml
@@ -8,7 +8,7 @@
%span.light Title:
%strong= @key.title
%li
- %span.light Created at:
+ %span.light Created on:
%strong= @key.created_at.stamp("Aug 21, 2011")
.span8
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index 93ae602a696..e1d0c7c11ec 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -13,7 +13,7 @@
.ui-box-body
%div
%cite.cgray
- Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
+ Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
- if @merge_request.assignee
\, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
- if @merge_request.milestone
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index ba04ad02d1c..cad072a83db 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -59,7 +59,7 @@
%br
.light-well
%p
- %span.light Created at
+ %span.light Created on
#{@project.created_at.stamp('Aug 22, 2013')}
%p
%span.light Owned by