Commit 860fa116 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #1117 from patthoyts/pt/user-form

Fix english on the edit user form.
parents 9267cb04 787e5e94
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
.alert .alert
.clearfix .clearfix
%p Give user ability to manage application. %p Make the user a GitLab administrator.
= f.label :admin, :class => "checkbox" do = f.label :admin, :class => "checkbox" do
= f.check_box :admin = f.check_box :admin
%span Administrator %span Administrator
...@@ -59,11 +59,11 @@ ...@@ -59,11 +59,11 @@
- if @admin_user.blocked - if @admin_user.blocked
%span %span
= link_to 'Unblock', unblock_admin_user_path(@admin_user), :method => :put, :class => "btn small" = 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 - else
%span %span
= link_to 'Block', block_admin_user_path(@admin_user), :confirm => 'USER WILL BE BLOCKED! Are you sure?', :method => :put, :class => "btn small danger" = 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 .actions
= f.submit 'Save', :class => "btn primary" = f.submit 'Save', :class => "btn primary"
- if @admin_user.new_record? - if @admin_user.new_record?
......
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