Download as
Browse Code »

Commit 860fa1163a5fbdfec2bb01ff2d584351554dee29

Authored by Dmitriy Zaporozhets
2 parents 9267cb04 787e5e94
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Fix english on the edit user form.
Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app/views/admin/users/_form.html.haml
  Diff comments   View file @860fa11
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 50
51 .alert 51 .alert
52 .clearfix 52 .clearfix
53 - %p Give user ability to manage application. 53 + %p Make the user a GitLab administrator.
54 = f.label :admin, :class => "checkbox" do 54 = f.label :admin, :class => "checkbox" do
55 = f.check_box :admin 55 = f.check_box :admin
56 %span Administrator 56 %span Administrator
@@ -59,11 +59,11 @@ @@ -59,11 +59,11 @@
59 - if @admin_user.blocked 59 - if @admin_user.blocked
60 %span 60 %span
61 = link_to 'Unblock', unblock_admin_user_path(@admin_user), :method => :put, :class => "btn small" 61 = link_to 'Unblock', unblock_admin_user_path(@admin_user), :method => :put, :class => "btn small"
62 - This user is blocked and is not able to login GitLab 62 + This user is blocked and is not able to login to GitLab
63 - else 63 - else
64 %span 64 %span
65 = link_to 'Block', block_admin_user_path(@admin_user), :confirm => 'USER WILL BE BLOCKED! Are you sure?', :method => :put, :class => "btn small danger" 65 = link_to 'Block', block_admin_user_path(@admin_user), :confirm => 'USER WILL BE BLOCKED! Are you sure?', :method => :put, :class => "btn small danger"
66 - Blocked user will removed from all projects & will not be able to login to GitLab. 66 + Blocked users will be removed from all projects & will not be able to login to GitLab.
67 .actions 67 .actions
68 = f.submit 'Save', :class => "btn primary" 68 = f.submit 'Save', :class => "btn primary"
69 - if @admin_user.new_record? 69 - if @admin_user.new_record?