Commit c2f74de4 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Merge pull request #5395 from dpursehouse/more-label-fixes

More label fixes
parents 88519e90 03dec79c
......@@ -25,7 +25,7 @@
= @group.description
%li
%span.light Created at:
%span.light Created on:
%strong
= @group.created_at.stamp("March 1, 1999")
......
......@@ -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!
......
......@@ -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"
......@@ -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
......
......@@ -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
......
......@@ -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
......
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