deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Fix english on the edit user form.
This commit is contained in:
Dmitriy Zaporozhets 2012-07-20 14:23:49 -07:00
parent 9267cb04b0 787e5e94ac
commit 860fa1163a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/admin/users/_form.html.haml
View file

@ -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?