Download as
Browse Code »

Commit 3e9460b6cb8184aada5932abeeafa6be53459a69

Authored by Dmitriy Zaporozhets
1 parent ce5fca48
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix minor wording

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/views/groups/edit.html.haml
  Diff comments   View file @3e9460b
... ... @@ -20,7 +20,7 @@
20 20 .ui-box
21 21 .title
22 22 %strong= @group.name
23   - Group Settings:
  23 + group settings:
24 24 %div.form-holder
25 25 = form_for @group do |f|
26 26 - if @group.errors.any?
... ... @@ -44,7 +44,7 @@
44 44 .ui-box
45 45 .title
46 46 %strong= @group.name
47   - Projects:
  47 + projects:
48 48 - if can? current_user, :manage_group, @group
49 49 %span.pull-right
50 50 = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny" do
... ... @@ -85,4 +85,4 @@
85 85 %p
86 86 %strong Removed group can not be restored!
87 87  
88   - = link_to 'Remove Group', @group, confirm: 'Removed group can not be restored! Are you sure?', method: :delete, class: "btn btn-remove btn-small"
  88 + = link_to 'Remove Group', @group, confirm: 'Removed group can not be restored! Are you sure?', method: :delete, class: "btn btn-remove"
... ...
app/views/projects/merge_requests/show/_how_to_merge.html.haml
  Diff comments   View file @3e9460b
1 1 %div#modal_merge_info.modal.hide
2 2 .modal-header
3 3 %a.close{href: "#", "data-dismiss" => "modal"} ×
4   - %h3 How To Merge
  4 + %h3 How to merge
5 5 .modal-body
6 6 %p
7 7 %strong Step 1.
... ...