diff options
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/accounts/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/keys/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
6 files changed, 6 insertions, 6 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/groups/edit.html.haml b/app/views/groups/edit.html.haml index d6df8d0aedf..10b974ea222 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -68,7 +68,7 @@ .title Remove group .ui-box-body %p - Remove of group will cause removing all child projects and resources. + Removing group will cause all child projects and resources to be removed. %p %strong Removed group can not be restored! diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index b950f3f7644..b76339027af 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -68,6 +68,6 @@ %li #{pluralize rp, 'personal project'} will be removed and cannot be restored - if current_user.solo_owned_groups.present? %li - Next groups will be abandoned. You should transfer or remove them: + The following groups will be abandoned. You should transfer or remove them: %strong #{current_user.solo_owned_groups.map(&:name).join(', ')} = link_to 'Delete account', user_registration_path, confirm: "REMOVE #{current_user.name}? Are you sure?", method: :delete, class: "btn btn-remove" 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 |