Commit ea818346a941d1a791cb655e543d29ef6c528e12
Exists in
master
and in
4 other branches
Merge pull request #687 from fixe/label-typo
Fixed typo in label
Showing
1 changed file
with
6 additions
and
6 deletions
Show diff stats
app/views/admin/users/_form.html.haml
| @@ -12,12 +12,12 @@ | @@ -12,12 +12,12 @@ | ||
| 12 | = f.label :name | 12 | = f.label :name |
| 13 | .input | 13 | .input |
| 14 | = f.text_field :name | 14 | = f.text_field :name |
| 15 | - %span.help-inline * requried | 15 | + %span.help-inline * required |
| 16 | .clearfix | 16 | .clearfix |
| 17 | = f.label :email | 17 | = f.label :email |
| 18 | .input | 18 | .input |
| 19 | = f.text_field :email | 19 | = f.text_field :email |
| 20 | - %span.help-inline * requried | 20 | + %span.help-inline * required |
| 21 | .clearfix | 21 | .clearfix |
| 22 | = f.label :password | 22 | = f.label :password |
| 23 | .input= f.password_field :password | 23 | .input= f.password_field :password |
| @@ -42,10 +42,10 @@ | @@ -42,10 +42,10 @@ | ||
| 42 | .alert | 42 | .alert |
| 43 | .clearfix | 43 | .clearfix |
| 44 | %p Give user ability to manage application. | 44 | %p Give user ability to manage application. |
| 45 | - = f.label :admin, :class => "checkbox" do | 45 | + = f.label :admin, :class => "checkbox" do |
| 46 | = f.check_box :admin | 46 | = f.check_box :admin |
| 47 | %span Administrator | 47 | %span Administrator |
| 48 | - - unless @admin_user.new_record? | 48 | + - unless @admin_user.new_record? |
| 49 | .alert.alert-error | 49 | .alert.alert-error |
| 50 | - if @admin_user.blocked | 50 | - if @admin_user.blocked |
| 51 | %span | 51 | %span |
| @@ -57,7 +57,7 @@ | @@ -57,7 +57,7 @@ | ||
| 57 | Blocked user will removed from all projects & will not be able to login to GitLab. | 57 | Blocked user will removed from all projects & will not be able to login to GitLab. |
| 58 | .actions | 58 | .actions |
| 59 | = f.submit 'Save', :class => "btn primary" | 59 | = f.submit 'Save', :class => "btn primary" |
| 60 | - - if @admin_user.new_record? | 60 | + - if @admin_user.new_record? |
| 61 | = link_to 'Cancel', admin_users_path, :class => "btn" | 61 | = link_to 'Cancel', admin_users_path, :class => "btn" |
| 62 | - - else | 62 | + - else |
| 63 | = link_to 'Cancel', admin_user_path(@admin_user), :class => "btn" | 63 | = link_to 'Cancel', admin_user_path(@admin_user), :class => "btn" |