diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index ba33338..13264b3 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -20,7 +20,7 @@ .ui-box .title %strong= @group.name - Group Settings: + group settings: %div.form-holder = form_for @group do |f| - if @group.errors.any? @@ -44,7 +44,7 @@ .ui-box .title %strong= @group.name - Projects: + projects: - if can? current_user, :manage_group, @group %span.pull-right = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny" do @@ -85,4 +85,4 @@ %p %strong Removed group can not be restored! - = link_to 'Remove Group', @group, confirm: 'Removed group can not be restored! Are you sure?', method: :delete, class: "btn btn-remove btn-small" + = link_to 'Remove Group', @group, confirm: 'Removed group can not be restored! Are you sure?', method: :delete, class: "btn btn-remove" diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml index 3864e3b..04d1109 100644 --- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml +++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml @@ -1,7 +1,7 @@ %div#modal_merge_info.modal.hide .modal-header %a.close{href: "#", "data-dismiss" => "modal"} × - %h3 How To Merge + %h3 How to merge .modal-body %p %strong Step 1. -- libgit2 0.21.2