diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-20 14:23:49 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-20 14:23:49 -0700 |
| commit | 860fa1163a5fbdfec2bb01ff2d584351554dee29 (patch) | |
| tree | 5bebe2454dc70cf8e98b6f553a1e873563b102b0 | |
| parent | 9267cb04b0b3fdf127899c4b7e636dc27fac06d3 (diff) | |
| parent | 787e5e94acf5e20280416c9fda105ef5b77576b3 (diff) | |
| download | gitlab-ce-860fa1163a5fbdfec2bb01ff2d584351554dee29.tar.gz | |
Merge pull request #1117 from patthoyts/pt/user-form
Fix english on the edit user form.
| -rw-r--r-- | app/views/admin/users/_form.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index bd2e136247a..c1955b321d5 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -50,7 +50,7 @@ .alert .clearfix - %p Give user ability to manage application. + %p Make the user a GitLab administrator. = f.label :admin, :class => "checkbox" do = f.check_box :admin %span Administrator @@ -59,11 +59,11 @@ - if @admin_user.blocked %span = link_to 'Unblock', unblock_admin_user_path(@admin_user), :method => :put, :class => "btn small" - This user is blocked and is not able to login GitLab + This user is blocked and is not able to login to GitLab - else %span = link_to 'Block', block_admin_user_path(@admin_user), :confirm => 'USER WILL BE BLOCKED! Are you sure?', :method => :put, :class => "btn small danger" - Blocked user will removed from all projects & will not be able to login to GitLab. + Blocked users will be removed from all projects & will not be able to login to GitLab. .actions = f.submit 'Save', :class => "btn primary" - if @admin_user.new_record? |