Merge branch 'button-capitalization' into 'master'

Button capitalisation

Closes #18931

See merge request !10418

app/helpers/blob_helper.rb

@@ -102,7 +102,7 @@ module BlobHelper
     if Gitlab::MarkupHelper.previewable?(filename)
       'Preview'
     else
-      'Preview Changes'
+      'Preview changes'
     end
   end
 

app/views/admin/abuse_reports/_abuse_report.html.haml

@@ -30,5 +30,5 @@
       = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-sm btn-block"
     - else
       .btn.btn-sm.disabled.btn-block
-        Already Blocked
+        Already blocked
     = link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-sm btn-block btn-close js-remove-tr"

app/views/admin/application_settings/_form.html.haml

@@ -148,7 +148,7 @@
             Sign-in enabled
     - if omniauth_enabled? && button_based_providers.any?
       .form-group
-        = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2'
+        = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'control-label col-sm-2'
         .col-sm-10
           .btn-group{ data: { toggle: 'buttons' } }
             - oauth_providers_checkboxes.each do |source|

app/views/admin/applications/index.html.haml

@@ -4,7 +4,7 @@
 %p.light
   System OAuth applications don't belong to any user and can only be managed by admins
 %hr
-%p= link_to 'New Application', new_admin_application_path, class: 'btn btn-success'
+%p= link_to 'New application', new_admin_application_path, class: 'btn btn-success'
 %table.table.table-striped
   %thead
     %tr

app/views/admin/dashboard/index.html.haml

@@ -125,7 +125,7 @@
             = link_to admin_projects_path do
               %h1= number_with_delimiter(Project.cached_count)
             %hr
-            = link_to('New Project', new_project_path, class: "btn btn-new")
+            = link_to('New project', new_project_path, class: "btn btn-new")
       .col-sm-4
         .light-well.well-centered
           %h4 Users
@@ -133,7 +133,7 @@
             = link_to admin_users_path do
               %h1= number_with_delimiter(User.count)
             %hr
-            = link_to 'New User', new_admin_user_path, class: "btn btn-new"
+            = link_to 'New user', new_admin_user_path, class: "btn btn-new"
       .col-sm-4
         .light-well.well-centered
           %h4 Groups
@@ -141,7 +141,7 @@
             = link_to admin_groups_path do
               %h1= number_with_delimiter(Group.count)
             %hr
-            = link_to 'New Group', new_admin_group_path, class: "btn btn-new"
+            = link_to 'New group', new_admin_group_path, class: "btn btn-new"
 
     .row.prepend-top-10
       .col-md-4

app/views/admin/deploy_keys/index.html.haml

@@ -3,7 +3,7 @@
 %h3.page-title.deploy-keys-title
   Public deploy keys (#{@deploy_keys.count})
   .pull-right
-    = link_to 'New Deploy Key', new_admin_deploy_key_path, class: 'btn btn-new btn-sm btn-inverted'
+    = link_to 'New deploy key', new_admin_deploy_key_path, class: 'btn btn-new btn-sm btn-inverted'
 
 - if @deploy_keys.any?
   .table-holder.deploy-keys-list

app/views/admin/groups/index.html.haml

@@ -30,7 +30,7 @@
                 = link_to admin_groups_path(sort: sort_value_largest_group, name: project_name) do
                   = sort_title_largest_group
           = link_to new_admin_group_path, class: "btn btn-new" do
-            New Group
+            New group
   %ul.content-list
     = render @groups
 

app/views/admin/groups/show.html.haml

@@ -116,7 +116,7 @@
         group members
         %span.badge= @group.members.size
         .pull-right
-          = link_to icon('pencil-square-o', text: 'Manage Access'), polymorphic_url([@group, :members]), class: "btn btn-xs"
+          = link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@group, :members]), class: "btn btn-xs"
       %ul.well-list.group-users-list.content-list
         = render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
       .panel-footer

app/views/admin/hooks/index.html.haml

@@ -51,7 +51,7 @@
           = f.check_box :enable_ssl_verification
           %strong Enable SSL verification
   .form-actions
-    = f.submit "Add System Hook", class: "btn btn-create"
+    = f.submit "Add system hook", class: "btn btn-create"
 %hr
 
 - if @hooks.any?
@@ -62,7 +62,7 @@
       - @hooks.each do |hook|
         %li
           .controls
-            = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-sm"
+            = link_to 'Test hook', admin_hook_test_path(hook), class: "btn btn-sm"
             = link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-sm"
           .monospace= hook.url
           %div

app/views/admin/identities/index.html.haml

 - page_title "Identities", @user.name, "Users"
 = render 'admin/users/head'
 
-= link_to 'New Identity', new_admin_user_identity_path, class: 'pull-right btn btn-new'
+= link_to 'New identity', new_admin_user_identity_path, class: 'pull-right btn btn-new'
 - if @identities.present?
   .table-holder
     %table.table

app/views/admin/projects/show.html.haml

@@ -159,7 +159,7 @@
           %span.badge= @group_members.size
           .pull-right
             = link_to admin_group_path(@group), class: 'btn btn-xs' do
-              = icon('pencil-square-o', text: 'Manage Access')
+              = icon('pencil-square-o', text: 'Manage access')
         %ul.well-list.content-list
           = render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false }
         .panel-footer
@@ -173,7 +173,7 @@
         project members
         %span.badge= @project.users.size
         .pull-right
-          = link_to icon('pencil-square-o', text: 'Manage Access'), polymorphic_url([@project, :members]), class: "btn btn-xs"
+          = link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@project, :members]), class: "btn btn-xs"
       %ul.well-list.project_members.content-list
         = render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
       .panel-footer

app/views/admin/spam_logs/_spam_log.html.haml

@@ -35,5 +35,5 @@
       = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs"
     - else
       .btn.btn-xs.disabled
-        Already Blocked
+        Already blocked
     = link_to 'Remove log', [:admin, spam_log], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"

app/views/admin/users/_user.html.haml

@@ -37,6 +37,6 @@
           - if user.can_be_removed? && can?(current_user, :destroy_user, @user)
             %li.divider
             %li
-              = link_to 'Delete User', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Consider cancelling this deletion and blocking the user instead. Are you sure?" },
+              = link_to 'Delete user', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Consider cancelling this deletion and blocking the user instead. Are you sure?" },
                                                    class: 'btn btn-remove btn-block',
                                                    method: :delete

app/views/admin/users/index.html.haml

@@ -33,7 +33,7 @@
                   = sort_title_recently_updated
                 = link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
                   = sort_title_oldest_updated
-          = link_to 'New User', new_admin_user_path, class: 'btn btn-new btn-search'
+          = link_to 'New user', new_admin_user_path, class: 'btn btn-new btn-search'
 
     .nav-block
       %ul.nav-links.wide.scrolling-tabs.white.scrolling-tabs

app/views/dashboard/_groups_head.html.haml

@@ -11,4 +11,4 @@
     = render 'shared/groups/dropdown'
     - if current_user.can_create_group?
       = link_to new_group_path, class: "btn btn-new" do
-        New Group
+        New group

app/views/dashboard/_projects_head.html.haml

@@ -19,4 +19,4 @@
     = render 'shared/projects/dropdown'
     - if current_user.can_create_project?
       = link_to new_project_path, class: 'btn btn-new' do
-        New Project
+        New project

app/views/dashboard/issues.html.haml

@@ -8,7 +8,7 @@
   .nav-controls
     = link_to params.merge(rss_url_options), class: 'btn has-tooltip', title: 'Subscribe' do
       = icon('rss')
-    = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue"
+    = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue"
 
 = render 'shared/issuable/filter', type: :issues
 = render 'shared/issues'

app/views/dashboard/merge_requests.html.haml

@@ -4,7 +4,7 @@
 .top-area
   = render 'shared/issuable/nav', type: :merge_requests
   .nav-controls
-    = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New Merge Request"
+    = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request"
 
 = render 'shared/issuable/filter', type: :merge_requests
 = render 'shared/merge_requests'

app/views/dashboard/milestones/index.html.haml

@@ -5,7 +5,7 @@
   = render 'shared/milestones_filter', counts: @milestone_states
 
   .nav-controls
-    = render 'shared/new_project_item_select', path: 'milestones/new', label: 'New Milestone', include_groups: true
+    = render 'shared/new_project_item_select', path: 'milestones/new', label: 'New milestone', include_groups: true
 
 .milestones
   %ul.content-list

app/views/events/_event_last_push.html.haml

@@ -10,5 +10,5 @@
         #{time_ago_with_tooltip(event.created_at)}
 
       .pull-right
-        = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
-          Create Merge Request
+        = link_to new_mr_path_from_push_event(event), title: "New merge request", class: "btn btn-info btn-sm" do
+          Create merge request

app/views/groups/edit.html.haml

@@ -51,4 +51,4 @@
       %strong Removed group can not be restored!
 
     .form-actions
-      = link_to 'Remove Group', @group, data: {confirm: 'Removed group can not be restored! Are you sure?'}, method: :delete, class: "btn btn-remove"
+      = link_to 'Remove group', @group, data: {confirm: 'Removed group can not be restored! Are you sure?'}, method: :delete, class: "btn btn-remove"

app/views/groups/issues.html.haml

@@ -11,7 +11,7 @@
         = icon('rss')
         %span.icon-label
           Subscribe
-      = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue"
+      = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue"
 
   = render 'shared/issuable/filter', type: :issues
 

app/views/groups/milestones/index.html.haml

@@ -7,7 +7,7 @@
   .nav-controls
     - if can?(current_user, :admin_milestones, @group)
       = link_to new_group_milestone_path(@group), class: "btn btn-new" do
-        New Milestone
+        New milestone
 
 .row-content-block
   Only milestones from

app/views/groups/milestones/new.html.haml

@@ -39,5 +39,5 @@
     = render "shared/milestones/form_dates", f: f
 
   .form-actions
-    = f.submit 'Create Milestone', class: "btn-create btn"
+    = f.submit 'Create milestone', class: "btn-create btn"
     = link_to "Cancel", group_milestones_path(@group), class: "btn btn-cancel"

app/views/groups/projects.html.haml

@@ -7,7 +7,7 @@
     - if can? current_user, :admin_group, @group
       .controls
         = link_to new_project_path(namespace_id: @group.id), class: "btn btn-sm btn-success" do
-          New Project
+          New project
   %ul.well-list
     - @projects.each do |project|
       %li

app/views/help/ui.html.haml

@@ -225,7 +225,7 @@
         %ul.dropdown-menu
           %li
             %a{ href: "#" }
-              Dropdown Option
+              Dropdown option
       .dropdown.inline.pull-right
         %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } }
           Dropdown
@@ -233,7 +233,7 @@
         %ul.dropdown-menu.dropdown-menu-align-right
           %li
             %a{ href: "#" }
-              Dropdown Option
+              Dropdown option
   .example
     %div
       .dropdown.inline
@@ -243,7 +243,7 @@
         %ul.dropdown-menu.dropdown-menu-selectable
           %li
             %a.is-active{ href: "#" }
-              Dropdown Option
+              Dropdown option
   .example
     %div
       .dropdown.inline
@@ -262,26 +262,26 @@
             %ul
               %li
                 %a.is-active{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li.divider
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
           .dropdown-footer
             %strong Tip:
             If an author is not a member of this project, you can still filter by his name while using the search field.
@@ -301,26 +301,26 @@
             %ul
               %li
                 %a.is-active{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li.divider
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
               %li
                 %a{ href: "#" }
-                  Dropdown Option
+                  Dropdown option
           .dropdown-footer
             %strong Tip:
             If an author is not a member of this project, you can still filter by his name while using the search field.

app/views/import/github/new.html.haml

@@ -9,7 +9,7 @@
     To import a GitHub project, you first need to authorize GitLab to access
     the list of your GitHub repositories:
 
-  = link_to 'List Your GitHub Repositories', status_import_github_path, class: 'btn btn-success'
+  = link_to 'List your GitHub repositories', status_import_github_path, class: 'btn btn-success'
 
   %hr
 
@@ -28,7 +28,7 @@
 = form_tag personal_access_token_import_github_path, method: :post, class: 'form-inline' do
   .form-group
     = text_field_tag :personal_access_token, '', class: 'form-control', placeholder: "Personal Access Token", size: 40
-    = submit_tag 'List Your GitHub Repositories', class: 'btn btn-success'
+    = submit_tag 'List your GitHub repositories', class: 'btn btn-success'
 
 - unless github_import_configured?
   %hr

app/views/layouts/header/_default.html.haml

@@ -29,11 +29,11 @@
           - if current_user
             - if session[:impersonator_id]
               %li.impersonation
-                = link_to admin_impersonation_path, method: :delete, title: "Stop Impersonation", aria: { label: 'Stop Impersonation' }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
+                = link_to admin_impersonation_path, method: :delete, title: "Stop impersonation", aria: { label: 'Stop impersonation' }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
                   = icon('user-secret fw')
             - if current_user.is_admin?
               %li
-                = link_to admin_root_path, title: 'Admin Area', aria: { label: "Admin Area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                = link_to admin_root_path, title: 'Admin area', aria: { label: "Admin area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                   = icon('wrench fw')
             - if current_user.can_create_project?
               %li

app/views/profiles/accounts/show.html.haml

@@ -49,14 +49,14 @@
     %p
       Status: #{current_user.two_factor_enabled? ? 'Enabled' : 'Disabled'}
     - if current_user.two_factor_enabled?
-      = link_to 'Manage Two-Factor Authentication', profile_two_factor_auth_path, class: 'btn btn-info'
+      = link_to 'Manage two-factor authentication', profile_two_factor_auth_path, class: 'btn btn-info'
       = link_to 'Disable', profile_two_factor_auth_path,
                 method: :delete,
                 data: { confirm: "Are you sure? This will invalidate your registered applications and U2F devices." },
                 class: 'btn btn-danger'
     - else
       .append-bottom-10
-        = link_to 'Enable Two-Factor Authentication', profile_two_factor_auth_path, class: 'btn btn-success'
+        = link_to 'Enable two-factor authentication', profile_two_factor_auth_path, class: 'btn btn-success'
 
 %hr
 - if button_based_providers.any?

app/views/profiles/emails/index.html.haml

@@ -33,17 +33,17 @@
       %li
         = @primary
         %span.pull-right
-          %span.label.label-success Primary Email
+          %span.label.label-success Primary email
           - if @primary === current_user.public_email
-            %span.label.label-info Public Email
+            %span.label.label-info Public email
           - if @primary === current_user.notification_email
-            %span.label.label-info Notification Email
+            %span.label.label-info Notification email
       - @emails.each do |email|
         %li
           = email.email
           %span.pull-right
             - if email.email === current_user.public_email
-              %span.label.label-info Public Email
+              %span.label.label-info Public email
             - if email.email === current_user.notification_email
-              %span.label.label-info Notification Email
+              %span.label.label-info Notification email
             = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-warning prepend-left-10'

app/views/profiles/two_factor_auths/show.html.haml

@@ -44,7 +44,7 @@
           = label_tag :pin_code, nil, class: "label-light"
           = text_field_tag :pin_code, nil, class: "form-control", required: true
         .prepend-top-default
-          = submit_tag 'Register with Two-Factor App', class: 'btn btn-success'
+          = submit_tag 'Register with two-factor app', class: 'btn btn-success'
 
 %hr
 

app/views/projects/_commit_button.html.haml

 .form-actions
-  = button_tag 'Commit Changes', class: 'btn commit-btn js-commit-button btn-create'
+  = button_tag 'Commit changes', class: 'btn commit-btn js-commit-button btn-create'
   = link_to 'Cancel', cancel_path,
             class: 'btn btn-cancel', data: {confirm: leave_edit_message}
 

app/views/projects/_find_file_link.html.haml

 = link_to namespace_project_find_file_path(@project.namespace, @project, @ref), class: 'btn btn-grouped shortcuts-find-file', rel: 'nofollow' do
   = icon('search')
-  %span Find File
+  %span Find file

app/views/projects/_last_push.html.haml

@@ -14,5 +14,5 @@
             #{time_ago_with_tooltip(event.created_at)}
 
           .pull-right
-            = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
-              Create Merge Request
+            = link_to new_mr_path_from_push_event(event), title: "New merge request", class: "btn btn-info btn-sm" do
+              Create merge request

app/views/projects/blob/_header.html.haml

@@ -20,7 +20,7 @@
       -# only show normal/blame view links for text files
       - if blob_text_viewable?(blob)
         - if current_page? namespace_project_blame_path(@project.namespace, @project, @id)
-          = link_to 'Normal View', namespace_project_blob_path(@project.namespace, @project, @id),
+          = link_to 'Normal view', namespace_project_blob_path(@project.namespace, @project, @id),
               class: 'btn btn-sm'
         - else
           = link_to 'Blame', namespace_project_blame_path(@project.namespace, @project, @id),

app/views/projects/blob/_template_selectors.html.haml

@@ -5,7 +5,7 @@
     .template-type-selector.js-template-type-selector-wrap.hidden
       = dropdown_tag("Choose type", options: { toggle_class: 'btn js-template-type-selector', title: "Choose a template type" } )
     .license-selector.js-license-selector-wrap.js-template-selector-wrap.hidden
-      = dropdown_tag("Apply a License template", options: { toggle_class: 'btn js-license-selector', title: "Apply a license", filter: true, placeholder: "Filter", data: { data: licenses_for_select, project: @project.name, fullname: @project.namespace.human_name } } )
+      = dropdown_tag("Apply a license template", options: { toggle_class: 'btn js-license-selector', title: "Apply a license", filter: true, placeholder: "Filter", data: { data: licenses_for_select, project: @project.name, fullname: @project.namespace.human_name } } )
     .gitignore-selector.js-gitignore-selector-wrap.js-template-selector-wrap.hidden
       = dropdown_tag("Apply a .gitignore template", options: { toggle_class: 'btn js-gitignore-selector', title: "Apply a template", filter: true, placeholder: "Filter", data: { data: gitignore_names } } )
     .gitlab-ci-yml-selector.js-gitlab-ci-yml-selector-wrap.js-template-selector-wrap.hidden

app/views/projects/branches/_branch.html.haml

@@ -21,7 +21,7 @@
     .controls.hidden-xs<
       - if merge_project && create_mr_button?(@repository.root_ref, branch.name)
         = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do
-          Merge Request
+          Merge request
 
       - if branch.name != @repository.root_ref
         = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: "btn btn-default #{'prepend-left-10' unless merge_project}", method: :post, title: "Compare" do

app/views/projects/builds/index.html.haml

@@ -17,7 +17,7 @@
           = link_to 'Get started with CI/CD Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
 
         = link_to ci_lint_path, class: 'btn btn-default' do
-          %span CI Lint
+          %span CI lint
 
   .content-list.builds-content-list
     = render "table", builds: @builds, project: @project

app/views/projects/commit/_commit_box.html.haml

@@ -20,7 +20,7 @@
         = icon('comment')
         = @notes_count
     = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-default append-right-10 hidden-xs hidden-sm" do
-      Browse Files
+      Browse files
     .dropdown.inline
       %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } }
         %span Options

app/views/projects/commits/show.html.haml

@@ -18,16 +18,16 @@
     .block-controls.hidden-xs.hidden-sm
       - if @merge_request.present?
         .control
-          = link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn'
+          = link_to "View open merge request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn'
       - elsif create_mr_button?(@repository.root_ref, @ref)
         .control
-          = link_to "Create Merge Request", create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
+          = link_to "Create merge request", create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
 
       .control
         = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'commits-search-form') do
           = search_field_tag :search, params[:search], { placeholder: 'Filter by commit message', id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false }
       .control
-        = link_to namespace_project_commits_path(@project.namespace, @project, @ref, rss_url_options), title: "Commits Feed", class: 'btn' do
+        = link_to namespace_project_commits_path(@project.namespace, @project, @ref, rss_url_options), title: "Commits feed", class: 'btn' do
           = icon("rss")
 
   %div{ id: dom_id(@project) }

app/views/projects/compare/_form.html.haml

@@ -21,6 +21,6 @@
      
     = button_tag "Compare", class: "btn btn-create commits-compare-btn"
     - if @merge_request.present?
-      = link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn'
+      = link_to "View open merge request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn'
     - elsif create_mr_button?
-      = link_to "Create Merge Request", create_mr_path, class: 'prepend-left-10 btn'
+      = link_to "Create merge request", create_mr_path, class: 'prepend-left-10 btn'

app/views/projects/forks/error.html.haml

@@ -22,4 +22,4 @@
     %p
       = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork", class: "btn" do
         %i.fa.fa-code-fork
-        Try to Fork again
+        Try to fork again

app/views/projects/issues/index.html.haml

@@ -24,9 +24,9 @@
                                                    issue: { assignee_id: issues_finder.assignee.try(:id),
                                                             milestone_id: issues_finder.milestones.first.try(:id) }),
                                                    class: "btn btn-new",
-                                                   title: "New Issue",
+                                                   title: "New issue",
                                                    id: "new_issue_link" do
-          New Issue
+          New issue
     = render 'shared/issuable/search_bar', type: :issues
 
     .issues-holder

app/views/projects/merge_requests/widget/_merged_buttons.haml

@@ -7,7 +7,7 @@
     - if can_remove_source_branch
       = link_to namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch), remote: true, method: :delete, class: "btn btn-default remove_source_branch" do
         = icon('trash-o')
-        Remove Source Branch
+        Remove source branch
     - if mr_can_be_reverted
       = revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "close")
     - if mr_can_be_cherry_picked

app/views/projects/merge_requests/widget/open/_accept.html.haml

@@ -10,24 +10,24 @@
         - if @pipeline && @pipeline.active?
           %span.btn-group
             = button_tag class: "btn btn-info js-merge-when-pipeline-succeeds-button merge-when-pipeline-succeeds" do
-              Merge When Pipeline Succeeds
+              Merge when pipeline succeeds
             - unless @project.only_allow_merge_if_pipeline_succeeds?
               = button_tag class: "btn btn-info dropdown-toggle", 'data-toggle' => 'dropdown' do
                 = icon('caret-down')
                 %span.sr-only
-                  Select Merge Moment
+                  Select merge moment
               %ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' }
                 %li
                   = link_to "#", class: "merge_when_pipeline_succeeds" do
                     = icon('check fw')
-                    Merge When Pipeline Succeeds
+                    Merge when pipeline succeeds
                 %li
                   = link_to "#", class: "accept-merge-request" do
                     = icon('warning fw')
-                    Merge Immediately
+                    Merge immediately
         - else
           = f.button class: "btn btn-grouped js-merge-button accept-merge-request" do
-            Accept Merge Request
+            Accept merge request
       - if @merge_request.force_remove_source_branch?
         .accept-control
           The source branch will be removed.

app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml

@@ -26,8 +26,8 @@
       - if remove_source_branch_button
         = link_to merge_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, merge_params(@merge_request)), remote: true, method: :post, class: "btn btn-grouped btn-primary btn-sm remove_source_branch" do
           = icon('times')
-          Remove Source Branch When Merged
+          Remove source branch when merged
 
       - if user_can_cancel_automatic_merge
         = link_to cancel_merge_when_pipeline_succeeds_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request), remote: true, method: :post, class: "btn btn-grouped btn-sm" do
-          Cancel Automatic Merge
+          Cancel automatic merge

app/views/projects/milestones/index.html.haml

@@ -9,8 +9,8 @@
     .nav-controls
       = render 'shared/milestones_sort_dropdown'
       - if can?(current_user, :admin_milestone, @project)
-        = link_to new_namespace_project_milestone_path(@project.namespace, @project), class: 'btn btn-new', title: 'New Milestone' do
-          New Milestone
+        = link_to new_namespace_project_milestone_path(@project.namespace, @project), class: 'btn btn-new', title: 'New milestone' do
+          New milestone
 
   .milestones
     %ul.content-list

app/views/projects/milestones/show.html.haml

@@ -23,9 +23,9 @@
     .milestone-buttons
       - if can?(current_user, :admin_milestone, @project)
         - if @milestone.active?
-          = link_to 'Close Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-nr btn-grouped"
+          = link_to 'Close milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-nr btn-grouped"
         - else
-          = link_to 'Reopen Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-nr btn-grouped"
+          = link_to 'Reopen milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-nr btn-grouped"
 
         = link_to edit_namespace_project_milestone_path(@project.namespace, @project, @milestone), class: "btn btn-grouped btn-nr" do
           Edit

app/views/projects/notes/_edit_form.html.haml

@@ -9,6 +9,6 @@
     .note-form-actions.clearfix
       .settings-message.note-edit-warning.js-edit-warning
         Finish editing this message first!
-      = submit_tag 'Save Comment', class: 'btn btn-nr btn-save js-comment-button'
+      = submit_tag 'Save comment', class: 'btn btn-nr btn-save js-comment-button'
       %button.btn.btn-nr.btn-cancel.note-edit-cancel{ type: 'button' }
         Cancel

app/views/projects/wikis/_main_links.html.haml

 - if (@page && @page.persisted?)
   - if can?(current_user, :create_wiki, @project)
     = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
-      New Page
+      New page
   = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn" do
-    Page History
+    Page history
   - if can?(current_user, :create_wiki, @project) && @page.latest?
     = link_to namespace_project_wiki_edit_path(@project.namespace, @project, @page), class: "btn" do
       Edit

app/views/projects/wikis/_new.html.haml

@@ -18,4 +18,4 @@
                 Tip: You can specify the full path for the new file.
                 We will automatically create any missing directories.
             .form-actions
-              = button_tag 'Create Page', class: 'build-new-wiki btn btn-create'
+              = button_tag 'Create page', class: 'build-new-wiki btn btn-create'

app/views/projects/wikis/edit.html.haml

@@ -22,10 +22,10 @@
     .nav-controls
       - if can?(current_user, :create_wiki, @project)
         = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
-          New Page
+          New page
       - if @page.persisted?
         = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn" do
-          Page History
+          Page history
         - if can?(current_user, :admin_wiki, @project)
           = link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-danger" do
             Delete

app/views/shared/_personal_access_tokens_form.html.haml

-- type = impersonation ? "Impersonation" : "Personal Access"
+- type = impersonation ? "impersonation" : "personal access"
 
 %h5.prepend-top-0
   Add a #{type} Token
@@ -22,7 +22,7 @@
     = render 'shared/tokens/scopes_form', prefix: 'personal_access_token', token: token, scopes: scopes
 
   .prepend-top-default
-    = f.submit "Create #{type} Token", class: "btn btn-create"
+    = f.submit "Create #{type} token", class: "btn btn-create"
 
 :javascript
   var $dateField = $('.datepicker');

app/views/shared/labels/_form.html.haml

@@ -29,5 +29,5 @@
     - if @label.persisted?
       = f.submit 'Save changes', class: 'btn btn-save js-save-button'
     - else
-      = f.submit 'Create Label', class: 'btn btn-create js-save-button'
+      = f.submit 'Create label', class: 'btn btn-create js-save-button'
     = link_to 'Cancel', back_path, class: 'btn btn-cancel'

app/views/shared/web_hooks/_form.html.haml

@@ -89,7 +89,7 @@
           = f.label :enable_ssl_verification do
             = f.check_box :enable_ssl_verification
             %strong Enable SSL verification
-      = f.submit "Add Webhook", class: "btn btn-create"
+      = f.submit "Add webhook", class: "btn btn-create"
     %hr
     %h5.prepend-top-default
       Webhooks (#{hooks.count})

app/views/u2f/_register.html.haml

@@ -7,13 +7,13 @@
   - if current_user.two_factor_otp_enabled?
     .row.append-bottom-10
       .col-md-3
-        %button#js-setup-u2f-device.btn.btn-info Setup New U2F Device
+        %button#js-setup-u2f-device.btn.btn-info Setup new U2F device
       .col-md-9
         %p Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left.
   - else
     .row.append-bottom-10
       .col-md-3
-        %button#js-setup-u2f-device.btn.btn-info{ disabled: true } Setup New U2F Device
+        %button#js-setup-u2f-device.btn.btn-info{ disabled: true } Setup new U2F device
       .col-md-9
         %p.text-warning You need to register a two-factor authentication app before you can set up a U2F device.
 
@@ -36,7 +36,7 @@
             = text_field_tag 'u2f_registration[name]', nil, class: 'form-control', placeholder: "Pick a name"
           .col-md-3
             = hidden_field_tag 'u2f_registration[device_response]', nil, class: 'form-control', required: true, id: "js-device-response"
-            = submit_tag "Register U2F Device", class: "btn btn-success"
+            = submit_tag "Register U2F device", class: "btn btn-success"
 
 :javascript
   var u2fRegister = new U2FRegister($("#js-register-u2f"), gon.u2f);

changelogs/unreleased/button-capitalization.yml

+---
+title: Changed capitalisation of buttons across GitLab
+merge_request: 10418
+author:

features/project/source/browse_files.feature

@@ -36,7 +36,7 @@ Feature: Project Source Browse Files
     And I edit code
     And I fill the new file name
     And I fill the commit message
-    And I click on "Commit Changes"
+    And I click on "Commit changes"
     Then I am redirected to the new file
     And I should see its new content
 
@@ -47,7 +47,7 @@ Feature: Project Source Browse Files
     And I edit code
     And I fill the new file name
     And I fill the commit message
-    And I click on "Commit Changes"
+    And I click on "Commit changes"
     Then I am redirected to the fork's new merge request page
     And I can see the new commit message
 
@@ -57,7 +57,7 @@ Feature: Project Source Browse Files
     And I edit code with new lines at end of file
     And I fill the new file name
     And I fill the commit message
-    And I click on "Commit Changes"
+    And I click on "Commit changes"
     Then I am redirected to the new file
     And I click button "Edit"
     And I should see its content with new lines preserved at end of file
@@ -69,7 +69,7 @@ Feature: Project Source Browse Files
     And I fill the new file name
     And I fill the commit message
     And I fill the new branch name
-    And I click on "Commit Changes"
+    And I click on "Commit changes"
     Then I am redirected to the new merge request page
     When I click on "Changes" tab
     And I should see its new content
@@ -173,7 +173,7 @@ Feature: Project Source Browse Files
     And I click button "Edit"
     And I edit code
     And I fill the commit message
-    And I click on "Commit Changes"
+    And I click on "Commit changes"
     Then I am redirected to the ".gitignore"
     And I should see its new content
 
@@ -186,7 +186,7 @@ Feature: Project Source Browse Files
     And I click button "Fork"
     And I edit code
     And I fill the commit message
-    And I click on "Commit Changes"
+    And I click on "Commit changes"
     Then I am redirected to the fork's new merge request page
     And I can see the new commit message
 
@@ -197,7 +197,7 @@ Feature: Project Source Browse Files
     And I edit code
     And I fill the commit message
     And I fill the new branch name
-    And I click on "Commit Changes"
+    And I click on "Commit changes"
     Then I am redirected to the new merge request page
     Then I click on "Changes" tab
     And I should see its new content

features/steps/dashboard/dashboard.rb

@@ -18,11 +18,11 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
 
   step 'I should see last push widget' do
     expect(page).to have_content "You pushed to fix"
-    expect(page).to have_link "Create Merge Request"
+    expect(page).to have_link "Create merge request"
   end
 
-  step 'I click "Create Merge Request" link' do
-    click_link "Create Merge Request"
+  step 'I click "Create merge request" link' do
+    click_link "Create merge request"
   end
 
   step 'I see prefilled new Merge Request page' do

features/steps/dashboard/new_project.rb

@@ -3,9 +3,9 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
   include SharedPaths
   include SharedProject
 
-  step 'I click "New Project" link' do
+  step 'I click "New project" link' do
     page.within('.content') do
-      click_link "New Project"
+      click_link "New project"
     end
   end
 

features/steps/group/milestones.rb

@@ -46,11 +46,11 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
   end
 
   step 'I click new milestone button' do
-    click_link "New Milestone"
+    click_link "New milestone"
   end
 
   step 'I press create mileston button' do
-    click_button "Create Milestone"
+    click_button "Create milestone"
   end
 
   step 'milestone in each project should be created' do

features/steps/project/builds/summary.rb

@@ -12,7 +12,7 @@ class Spinach::Features::ProjectBuildsSummary < Spinach::FeatureSteps
 
   step 'I see button to CI Lint' do
     page.within('.nav-controls') do
-      ci_lint_tool_link = page.find_link('CI Lint')
+      ci_lint_tool_link = page.find_link('CI lint')
       expect(ci_lint_tool_link[:href]).to eq ci_lint_path
     end
   end

features/steps/project/commits/commits.rb

@@ -13,7 +13,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   end
 
   step 'I click atom feed link' do
-    click_link "Commits Feed"
+    click_link "Commits feed"
   end
 
   step 'I see commits atom feed' do
@@ -110,16 +110,16 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
   end
 
   step 'I see button to create a new merge request' do
-    expect(page).to have_link 'Create Merge Request'
+    expect(page).to have_link 'Create merge request'
   end
 
   step 'I should not see button to create a new merge request' do
-    expect(page).not_to have_link 'Create Merge Request'
+    expect(page).not_to have_link 'Create merge request'
   end
 
   step 'I should see button to the merge request' do
     merge_request = MergeRequest.find_by(title: 'Feature')
-    expect(page).to have_link "View Open Merge Request", href: namespace_project_merge_request_path(@project.namespace, @project, merge_request)
+    expect(page).to have_link "View open merge request", href: namespace_project_merge_request_path(@project.namespace, @project, merge_request)
   end
 
   step 'I see breadcrumb links' do

features/steps/project/deploy_keys.rb

@@ -26,7 +26,7 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
   end
 
   step 'I click \'New Deploy Key\'' do
-    click_link 'New Deploy Key'
+    click_link 'New deploy key'
   end
 
   step 'I submit new deploy key' do

features/steps/project/hooks.rb

@@ -25,14 +25,14 @@ class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
   step 'I submit new hook' do
     @url = 'http://example.org/1'
     fill_in "hook_url", with: @url
-    expect { click_button "Add Webhook" }.to change(ProjectHook, :count).by(1)
+    expect { click_button "Add webhook" }.to change(ProjectHook, :count).by(1)
   end
 
   step 'I submit new hook with SSL verification enabled' do
     @url = 'http://example.org/2'
     fill_in "hook_url", with: @url
     check "hook_enable_ssl_verification"
-    expect { click_button "Add Webhook" }.to change(ProjectHook, :count).by(1)
+    expect { click_button "Add webhook" }.to change(ProjectHook, :count).by(1)
   end
 
   step 'I should see newly created hook' do

features/steps/project/issues/issues.rb

@@ -61,7 +61,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
     expect(page).to have_content "Tweet control"
   end
 
-  step 'I click link "New Issue"' do
+  step 'I click link "New issue"' do
     page.has_link?('New Issue') ? click_link('New Issue') : click_link('New issue')
   end
 

features/steps/project/issues/labels.rb

@@ -31,19 +31,19 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
   step 'I submit new label \'support\'' do
     fill_in 'Title', with: 'support'
     fill_in 'Background color', with: '#F95610'
-    click_button 'Create Label'
+    click_button 'Create label'
   end
 
   step 'I submit new label \'bug\'' do
     fill_in 'Title', with: 'bug'
     fill_in 'Background color', with: '#F95610'
-    click_button 'Create Label'
+    click_button 'Create label'
   end
 
   step 'I submit new label with invalid color' do
     fill_in 'Title', with: 'support'
     fill_in 'Background color', with: '#12'
-    click_button 'Create Label'
+    click_button 'Create label'
   end
 
   step 'I should see label label exist error message' do

features/steps/project/issues/milestones.rb

@@ -16,7 +16,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
   end
 
   step 'I click link "New Milestone"' do
-    click_link "New Milestone"
+    click_link "New milestone"
   end
 
   step 'I submit new milestone "v2.3"' do

features/steps/project/merge_requests.rb

@@ -300,10 +300,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
       page.within('.current-note-edit-form', visible: true) do
         fill_in 'note_note', with: 'Typo, please fix'
-        click_button 'Save Comment'
+        click_button 'Save comment'
       end
 
-      expect(page).not_to have_button 'Save Comment', disabled: true, visible: true
+      expect(page).not_to have_button 'Save comment', disabled: true, visible: true
     end
   end
 
@@ -378,7 +378,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'merge request is mergeable' do
-    expect(page).to have_button 'Accept Merge Request'
+    expect(page).to have_button 'Accept merge request'
   end
 
   step 'I modify merge commit message' do
@@ -392,7 +392,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I accept this merge request' do
     page.within '.mr-state-widget' do
-      click_button "Accept Merge Request"
+      click_button "Accept merge request"
     end
   end
 

features/steps/project/merge_requests/acceptance.rb

@@ -15,15 +15,15 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
   end
 
   step 'I click on Accept Merge Request' do
-    click_button('Accept Merge Request')
+    click_button('Accept merge request')
   end
 
   step 'I should see the Remove Source Branch button' do
-    expect(page).to have_link('Remove Source Branch')
+    expect(page).to have_link('Remove source branch')
   end
 
   step 'I should not see the Remove Source Branch button' do
-    expect(page).not_to have_link('Remove Source Branch')
+    expect(page).not_to have_link('Remove source branch')
   end
 
   step 'There is an open Merge Request' do

features/steps/project/merge_requests/revert.rb

@@ -26,7 +26,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click on Accept Merge Request' do
-    click_button('Accept Merge Request')
+    click_button('Accept merge request')
   end
 
   step 'I am signed in as a developer of the project' do

features/steps/project/project_find_file.rb

@@ -9,7 +9,7 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps
   end
 
   step 'I click Find File button' do
-    click_link 'Find File'
+    click_link 'Find file'
   end
 
   step 'I should see "find file" page' do

features/steps/project/source/browse_files.rb

@@ -105,11 +105,11 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   end
 
   step 'I click link "Diff"' do
-    click_link 'Preview Changes'
+    click_link 'Preview changes'
   end
 
-  step 'I click on "Commit Changes"' do
-    click_button 'Commit Changes'
+  step 'I click on "Commit changes"' do
+    click_button 'Commit changes'
   end
 
   step 'I click on "Changes" tab' do

features/steps/project/source/markdown_render.rb

@@ -214,7 +214,9 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
   step 'I add various links to the wiki page' do
     fill_in "wiki[content]", with: "[test](test)\n[GitLab API doc](api)\n[Rake tasks](raketasks)\n"
     fill_in "wiki[message]", with: "Adding links to wiki"
-    click_button "Create page"
+    page.within '.wiki-form' do
+      click_button "Create page"
+    end
   end
 
   step 'Wiki page should have added links' do
@@ -225,7 +227,9 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
   step 'I add a header to the wiki page' do
     fill_in "wiki[content]", with: "# Wiki header\n"
     fill_in "wiki[message]", with: "Add header to wiki"
-    click_button "Create page"
+    page.within '.wiki-form' do
+      click_button "Create page"
+    end
   end
 
   step 'Wiki header should have correct id and link' do

features/steps/project/wiki.rb

@@ -16,12 +16,16 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
 
   step 'I create the Wiki Home page' do
     fill_in "wiki_content", with: '[link test](test)'
-    click_on "Create page"
+    page.within '.wiki-form' do
+      click_on "Create page"
+    end
   end
 
   step 'I create the Wiki Home page with no content' do
     fill_in "wiki_content", with: ''
-    click_on "Create page"
+    page.within '.wiki-form' do
+      click_on "Create page"
+    end
   end
 
   step 'I should see the newly created wiki page' do
@@ -29,7 +33,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
     expect(page).to have_content "link test"
 
     click_link "link test"
-    expect(page).to have_content "Create Page"
+    expect(page).to have_content "Create page"
   end
 
   step 'I have an existing Wiki page' do
@@ -63,7 +67,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
   end
 
   step 'I click the History button' do
-    click_on "History"
+    click_on 'Page history'
   end
 
   step 'I should see both revisions' do
@@ -121,15 +125,19 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
   step 'I should see the new wiki page form' do
     expect(current_path).to match('wikis/image.jpg')
     expect(page).to have_content('New Wiki Page')
-    expect(page).to have_content('Create Page')
+    expect(page).to have_content('Create page')
   end
 
   step 'I create a New page with paths' do
-    click_on 'New Page'
+    click_on 'New page'
     fill_in 'Page slug', with: 'one/two/three-test'
-    click_on 'Create Page'
+    page.within '#modal-new-wiki' do
+      click_on 'Create page'
+    end
     fill_in "wiki_content", with: 'wiki content'
-    click_on "Create page"
+    page.within '.wiki-form' do
+      click_on "Create page"
+    end
     expect(current_path).to include 'one/two/three-test'
   end
 
@@ -154,11 +162,11 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
 
   step 'I view the page history of a Wiki page that has a path' do
     click_on 'Three'
-    click_on 'Page History'
+    click_on 'Page history'
   end
 
   step 'I click on Page History' do
-    click_on 'Page History'
+    click_on 'Page history'
   end
 
   step 'I should see the page history' do

features/steps/shared/note.rb

@@ -141,7 +141,7 @@ module SharedNote
 
     page.within(".current-note-edit-form") do
       fill_in 'note[note]', with: '+1 Awesome!'
-      click_button 'Save Comment'
+      click_button 'Save comment'
     end
   end
 

spec/features/admin/admin_deploy_keys_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'admin deploy keys', type: :feature do
   describe 'create new deploy key' do
     before do
       visit admin_deploy_keys_path
-      click_link 'New Deploy Key'
+      click_link 'New deploy key'
     end
 
     it 'creates new deploy key' do

spec/features/admin/admin_groups_spec.rb

@@ -24,7 +24,7 @@ feature 'Admin Groups', feature: true do
     it 'creates new group' do
       visit admin_groups_path
 
-      click_link "New Group"
+      click_link "New group"
       fill_in 'group_path', with: 'gitlab'
       fill_in 'group_description', with: 'Group description'
       click_button "Create group"

spec/features/admin/admin_hooks_spec.rb

@@ -33,7 +33,7 @@ describe "Admin::Hooks", feature: true do
       fill_in 'hook_url', with: url
       check 'Enable SSL verification'
 
-      expect { click_button 'Add System Hook' }.to change(SystemHook, :count).by(1)
+      expect { click_button 'Add system hook' }.to change(SystemHook, :count).by(1)
       expect(page).to have_content 'SSL Verification: enabled'
       expect(current_path).to eq(admin_hooks_path)
       expect(page).to have_content(url)
@@ -44,7 +44,7 @@ describe "Admin::Hooks", feature: true do
     before do
       WebMock.stub_request(:post, @system_hook.url)
       visit admin_hooks_path
-      click_link "Test Hook"
+      click_link "Test hook"
     end
 
     it { expect(current_path).to eq(admin_hooks_path) }

spec/features/admin/admin_manage_applications_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'admin manage applications', feature: true do
   it do
     visit admin_applications_path
 
-    click_on 'New Application'
+    click_on 'New application'
     expect(page).to have_content('New application')
 
     fill_in :doorkeeper_application_name, with: 'test'

spec/features/admin/admin_users_impersonation_tokens_spec.rb

@@ -30,7 +30,7 @@ describe 'Admin > Users > Impersonation Tokens', feature: true, js: true do
       check "api"
       check "read_user"
 
-      expect { click_on "Create Impersonation Token" }.to change { PersonalAccessTokensFinder.new(impersonation: true).execute.count }
+      expect { click_on "Create impersonation token" }.to change { PersonalAccessTokensFinder.new(impersonation: true).execute.count }
       expect(active_impersonation_tokens).to have_text(name)
       expect(active_impersonation_tokens).to have_text('In')
       expect(active_impersonation_tokens).to have_text('api')

spec/features/auto_deploy_spec.rb

@@ -56,7 +56,7 @@ describe 'Auto deploy' do
         click_on 'OpenShift'
       end
       wait_for_ajax
-      click_button 'Commit Changes'
+      click_button 'Commit changes'
 
       expect(page).to have_content('New Merge Request From auto-deploy into master')
     end

spec/features/dashboard/group_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'Dashboard Group', feature: true do
 
   it 'creates new grpup' do
     visit dashboard_groups_path
-    click_link 'New Group'
+    click_link 'New group'
 
     fill_in 'group_path', with: 'Samurai'
     fill_in 'group_description', with: 'Tokugawa Shogunate'

spec/features/groups_spec.rb

@@ -153,7 +153,7 @@ feature 'Group', feature: true do
     end
 
     it 'removes group' do
-      click_link 'Remove Group'
+      click_link 'Remove group'
 
       expect(page).to have_content "scheduled for deletion"
     end

spec/features/merge_requests/check_if_mergeable_with_unresolved_discussions_spec.rb

@@ -19,7 +19,7 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
       it 'does not allow to merge' do
         visit_merge_request(merge_request)
 
-        expect(page).not_to have_button 'Accept Merge Request'
+        expect(page).not_to have_button 'Accept merge request'
         expect(page).to have_content('This merge request has unresolved discussions')
       end
     end
@@ -32,7 +32,7 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
       it 'allows MR to be merged' do
         visit_merge_request(merge_request)
 
-        expect(page).to have_button 'Accept Merge Request'
+        expect(page).to have_button 'Accept merge request'
       end
     end
   end
@@ -46,7 +46,7 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
       it 'does not allow to merge' do
         visit_merge_request(merge_request)
 
-        expect(page).to have_button 'Accept Merge Request'
+        expect(page).to have_button 'Accept merge request'
       end
     end
 
@@ -58,7 +58,7 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
       it 'allows MR to be merged' do
         visit_merge_request(merge_request)
 
-        expect(page).to have_button 'Accept Merge Request'
+        expect(page).to have_button 'Accept merge request'
       end
     end
   end

spec/features/merge_requests/create_new_mr_spec.rb

@@ -26,7 +26,7 @@ feature 'Create New Merge Request', feature: true, js: true do
   end
 
   it 'selects the target branch sha when a tag with the same name exists' do
-    visit namespace_project_merge_requests_path(project.namespace, project)
+    visit namespace_project_merge_requests_path(project.namespace, project)    
 
     click_link 'New merge request'
 

spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb

@@ -32,7 +32,7 @@ feature 'Merge immediately', :feature, :js do
       page.within '.mr-widget-body' do
         find('.dropdown-toggle').click
 
-        click_link 'Merge Immediately'
+        click_link 'Merge immediately'
 
         expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress')
 

spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb

@@ -28,25 +28,25 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
       visit_merge_request(merge_request)
     end
 
-    it 'displays the Merge When Pipeline Succeeds button' do
-      expect(page).to have_button "Merge When Pipeline Succeeds"
+    it 'displays the Merge when pipeline succeeds button' do
+      expect(page).to have_button "Merge when pipeline succeeds"
     end
 
-    describe 'enabling Merge When Pipeline Succeeds' do
-      shared_examples 'Merge When Pipeline Succeeds activator' do
-        it 'activates the Merge When Pipeline Succeeds feature' do
-          click_button "Merge When Pipeline Succeeds"
+    describe 'enabling Merge when pipeline succeeds' do
+      shared_examples 'Merge when pipeline succeeds activator' do
+        it 'activates the Merge when pipeline succeeds feature' do
+          click_button "Merge when pipeline succeeds"
 
           expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds."
           expect(page).to have_content "The source branch will not be removed."
-          expect(page).to have_link "Cancel Automatic Merge"
+          expect(page).to have_link "Cancel automatic merge"
           visit_merge_request(merge_request) # Needed to refresh the page
           expect(page).to have_content /enabled an automatic merge when the pipeline for \h{8} succeeds/i
         end
       end
 
       context "when enabled immediately" do
-        it_behaves_like 'Merge When Pipeline Succeeds activator'
+        it_behaves_like 'Merge when pipeline succeeds activator'
       end
 
       context 'when enabled after pipeline status changed' do
@@ -60,16 +60,16 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
           expect(page).to have_content "Pipeline ##{pipeline.id} running"
         end
 
-        it_behaves_like 'Merge When Pipeline Succeeds activator'
+        it_behaves_like 'Merge when pipeline succeeds activator'
       end
 
       context 'when enabled after it was previously canceled' do
         before do
-          click_button "Merge When Pipeline Succeeds"
-          click_link "Cancel Automatic Merge"
+          click_button "Merge when pipeline succeeds"
+          click_link "Cancel automatic merge"
         end
 
-        it_behaves_like 'Merge When Pipeline Succeeds activator'
+        it_behaves_like 'Merge when pipeline succeeds activator'
       end
 
       context 'when it was enabled and then canceled' do
@@ -83,10 +83,10 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
         end
 
         before do
-          click_link "Cancel Automatic Merge"
+          click_link "Cancel automatic merge"
         end
 
-        it_behaves_like 'Merge When Pipeline Succeeds activator'
+        it_behaves_like 'Merge when pipeline succeeds activator'
       end
     end
   end
@@ -110,18 +110,18 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
     end
 
     it 'allows to cancel the automatic merge' do
-      click_link "Cancel Automatic Merge"
+      click_link "Cancel automatic merge"
 
-      expect(page).to have_button "Merge When Pipeline Succeeds"
+      expect(page).to have_button "Merge when pipeline succeeds"
 
       visit_merge_request(merge_request) # refresh the page
       expect(page).to have_content "canceled the automatic merge"
     end
 
     it "allows the user to remove the source branch" do
-      expect(page).to have_link "Remove Source Branch When Merged"
+      expect(page).to have_link "Remove source branch when merged"
 
-      click_link "Remove Source Branch When Merged"
+      click_link "Remove source branch when merged"
       expect(page).to have_content "The source branch will be removed"
     end
 
@@ -141,7 +141,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
     it "does not allow to enable merge when pipeline succeeds" do
       visit_merge_request(merge_request)
 
-      expect(page).not_to have_link 'Merge When Pipeline Succeeds'
+      expect(page).not_to have_link 'Merge when pipeline succeeds'
     end
   end
 

spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb

@@ -14,7 +14,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
     it 'allows MR to be merged' do
       visit_merge_request(merge_request)
 
-      expect(page).to have_button 'Accept Merge Request'
+      expect(page).to have_button 'Accept merge request'
     end
   end
 
@@ -38,8 +38,8 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
         it 'does not allow to merge immediately' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Merge When Pipeline Succeeds'
-          expect(page).not_to have_button 'Select Merge Moment'
+          expect(page).to have_button 'Merge when pipeline succeeds'
+          expect(page).not_to have_button 'Select merge moment'
         end
       end
 
@@ -49,7 +49,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
         it 'does not allow MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).not_to have_button 'Accept Merge Request'
+          expect(page).not_to have_button 'Accept merge request'
           expect(page).to have_content('Please retry the job or push a new commit to fix the failure.')
         end
       end
@@ -60,7 +60,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
         it 'does not allow MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).not_to have_button 'Accept Merge Request'
+          expect(page).not_to have_button 'Accept merge request'
           expect(page).to have_content('Please retry the job or push a new commit to fix the failure.')
         end
       end
@@ -71,7 +71,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Accept Merge Request'
+          expect(page).to have_button 'Accept merge request'
         end
       end
 
@@ -81,7 +81,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Accept Merge Request'
+          expect(page).to have_button 'Accept merge request'
         end
       end
     end
@@ -97,10 +97,10 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
         it 'allows MR to be merged immediately', js: true do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Merge When Pipeline Succeeds'
+          expect(page).to have_button 'Merge when pipeline succeeds'
 
-          click_button 'Select Merge Moment'
-          expect(page).to have_content 'Merge Immediately'
+          click_button 'Select merge moment'
+          expect(page).to have_content 'Merge immediately'
         end
       end
 
@@ -110,7 +110,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Accept Merge Request'
+          expect(page).to have_button 'Accept merge request'
         end
       end
 
@@ -120,7 +120,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Accept Merge Request'
+          expect(page).to have_button 'Accept merge request'
         end
       end
     end

spec/features/merge_requests/widget_spec.rb

@@ -145,7 +145,7 @@ describe 'Merge request', :feature, :js do
     before do
       allow_any_instance_of(Repository).to receive(:merge).and_return(false)
       visit namespace_project_merge_request_path(project.namespace, project, merge_request)
-      click_button 'Accept Merge Request'
+      click_button 'Accept merge request'
       wait_for_ajax
     end
 

spec/features/profiles/personal_access_tokens_spec.rb

@@ -41,7 +41,7 @@ describe 'Profile > Personal Access Tokens', feature: true, js: true do
       check "api"
       check "read_user"
 
-      click_on "Create Personal Access Token"
+      click_on "Create personal access token"
       expect(active_personal_access_tokens).to have_text(name)
       expect(active_personal_access_tokens).to have_text('In')
       expect(active_personal_access_tokens).to have_text('api')
@@ -54,7 +54,7 @@ describe 'Profile > Personal Access Tokens', feature: true, js: true do
         visit profile_personal_access_tokens_path
         fill_in "Name", with: 'My PAT'
 
-        expect { click_on "Create Personal Access Token" }.not_to change { PersonalAccessToken.count }
+        expect { click_on "Create personal access token" }.not_to change { PersonalAccessToken.count }
         expect(page).to have_content("Name cannot be nil")
       end
     end

spec/features/projects/blobs/edit_spec.rb

@@ -22,7 +22,7 @@ feature 'Editing file blob', feature: true, js: true do
       wait_for_ajax
       find('.js-edit-blob').click
       execute_script('ace.edit("editor").setValue("class NextFeature\nend\n")')
-      click_button 'Commit Changes'
+      click_button 'Commit changes'
     end
 
     context 'from MR diff' do

spec/features/projects/blobs/user_create_spec.rb

@@ -22,7 +22,7 @@ feature 'New blob creation', feature: true, js: true do
   end
 
   def commit_file
-    click_button 'Commit Changes'
+    click_button 'Commit changes'
   end
 
   context 'with default target branch' do

spec/features/projects/files/creating_a_file_spec.rb

@@ -19,7 +19,7 @@ feature 'User wants to create a file', feature: true do
     file_content = find('#file-content')
     file_content.set options[:file_content] || 'Some content'
 
-    click_button 'Commit Changes'
+    click_button 'Commit changes'
   end
 
   scenario 'file name contains Chinese characters' do

spec/features/projects/files/editing_a_file_spec.rb

@@ -27,7 +27,7 @@ feature 'User wants to edit a file', feature: true do
   scenario 'file has been updated since the user opened the edit page' do
     Files::UpdateService.new(project, user, commit_params).execute
 
-    click_button 'Commit Changes'
+    click_button 'Commit changes'
 
     expect(page).to have_content 'Someone edited the file the same time you did.'
   end

spec/features/projects/files/project_owner_creates_license_file_spec.rb

@@ -29,7 +29,7 @@ feature 'project owner creates a license file', feature: true, js: true do
     expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
-    click_button 'Commit Changes'
+    click_button 'Commit changes'
 
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
@@ -53,7 +53,7 @@ feature 'project owner creates a license file', feature: true, js: true do
     expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
-    click_button 'Commit Changes'
+    click_button 'Commit changes'
 
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
@@ -63,7 +63,7 @@ feature 'project owner creates a license file', feature: true, js: true do
 
   def select_template(template)
     page.within('.js-license-selector-wrap') do
-      click_button 'Apply a License template'
+      click_button 'Apply a license template'
       click_link template
       wait_for_ajax
     end

spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb

@@ -30,7 +30,7 @@ feature 'project owner sees a link to create a license file in empty project', f
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
     # Remove pre-receive hook so we can push without auth
     FileUtils.rm_f(File.join(project.repository.path, 'hooks', 'pre-receive'))
-    click_button 'Commit Changes'
+    click_button 'Commit changes'
 
     expect(current_path).to eq(
       namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
@@ -40,7 +40,7 @@ feature 'project owner sees a link to create a license file in empty project', f
 
   def select_template(template)
     page.within('.js-license-selector-wrap') do
-      click_button 'Apply a License template'
+      click_button 'Apply a license template'
       click_link template
       wait_for_ajax
     end

spec/features/projects/files/template_type_dropdown_spec.rb

@@ -48,7 +48,7 @@ feature 'Template type dropdown selector', js: true do
 
     context 'user previews changes' do
       before do
-        click_link 'Preview Changes'
+        click_link 'Preview changes'
       end
 
       scenario 'type selector is hidden and shown correctly' do
@@ -102,7 +102,7 @@ def check_type_selector_display(is_visible)
 end
 
 def try_selecting_all_types
-  try_selecting_template_type('LICENSE', 'Apply a License template')
+  try_selecting_template_type('LICENSE', 'Apply a license template')
   try_selecting_template_type('Dockerfile', 'Apply a Dockerfile template')
   try_selecting_template_type('.gitlab-ci.yml', 'Apply a GitLab CI Yaml template')
   try_selecting_template_type('.gitignore', 'Apply a .gitignore template')
@@ -130,6 +130,6 @@ end
 
 def create_and_edit_file(file_name)
   visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: file_name)
-  click_button "Commit Changes"
+  click_button "Commit changes"
   visit namespace_project_edit_blob_path(project.namespace, project, File.join(project.default_branch, file_name))
 end

spec/features/projects/files/undo_template_spec.rb

@@ -17,7 +17,7 @@ feature 'Template Undo Button', js: true do
     end
     
     scenario 'reverts template application' do
-      try_template_undo('http://www.apache.org/licenses/', 'Apply a License template')
+      try_template_undo('http://www.apache.org/licenses/', 'Apply a license template')
     end
   end
   
@@ -29,7 +29,7 @@ feature 'Template Undo Button', js: true do
     end
 
     scenario 'reverts template application' do
-      try_template_undo('http://www.apache.org/licenses/', 'Apply a License template')
+      try_template_undo('http://www.apache.org/licenses/', 'Apply a license template')
     end
   end
 end

spec/features/projects/merge_request_button_spec.rb

 require 'spec_helper'
 
 feature 'Merge Request button', feature: true do
-  shared_examples 'Merge Request button only shown when allowed' do
+  shared_examples 'Merge request button only shown when allowed' do
     let(:user) { create(:user) }
     let(:project) { create(:project, :public) }
     let(:forked_project) { create(:project, :public, forked_from_project: project) }
 
     context 'not logged in' do
-      it 'does not show Create Merge Request button' do
+      it 'does not show Create merge request button' do
         visit url
 
         within("#content-body") do
@@ -22,7 +22,7 @@ feature 'Merge Request button', feature: true do
         project.team << [user, :developer]
       end
 
-      it 'shows Create Merge Request button' do
+      it 'shows Create merge request button' do
         href = new_namespace_project_merge_request_path(project.namespace,
                                                         project,
                                                         merge_request: { source_branch: 'feature',
@@ -40,7 +40,7 @@ feature 'Merge Request button', feature: true do
           project.project_feature.update!(merge_requests_access_level: ProjectFeature::DISABLED)
         end
 
-        it 'does not show Create Merge Request button' do
+        it 'does not show Create merge request button' do
           visit url
 
           within("#content-body") do
@@ -55,7 +55,7 @@ feature 'Merge Request button', feature: true do
         login_as(user)
       end
 
-      it 'does not show Create Merge Request button' do
+      it 'does not show Create merge request button' do
         visit url
 
         within("#content-body") do
@@ -66,7 +66,7 @@ feature 'Merge Request button', feature: true do
       context 'on own fork of project' do
         let(:user) { forked_project.owner }
 
-        it 'shows Create Merge Request button' do
+        it 'shows Create merge request button' do
           href = new_namespace_project_merge_request_path(forked_project.namespace,
                                                           forked_project,
                                                           merge_request: { source_branch: 'feature',
@@ -83,24 +83,24 @@ feature 'Merge Request button', feature: true do
   end
 
   context 'on branches page' do
-    it_behaves_like 'Merge Request button only shown when allowed' do
-      let(:label) { 'Merge Request' }
+    it_behaves_like 'Merge request button only shown when allowed' do
+      let(:label) { 'Merge request' }
       let(:url) { namespace_project_branches_path(project.namespace, project) }
       let(:fork_url) { namespace_project_branches_path(forked_project.namespace, forked_project) }
     end
   end
 
   context 'on compare page' do
-    it_behaves_like 'Merge Request button only shown when allowed' do
-      let(:label) { 'Create Merge Request' }
+    it_behaves_like 'Merge request button only shown when allowed' do
+      let(:label) { 'Create merge request' }
       let(:url) { namespace_project_compare_path(project.namespace, project, from: 'master', to: 'feature') }
       let(:fork_url) { namespace_project_compare_path(forked_project.namespace, forked_project, from: 'master', to: 'feature') }
     end
   end
 
   context 'on commits page' do
-    it_behaves_like 'Merge Request button only shown when allowed' do
-      let(:label) { 'Create Merge Request' }
+    it_behaves_like 'Merge request button only shown when allowed' do
+      let(:label) { 'Create merge request' }
       let(:url) { namespace_project_commits_path(project.namespace, project, 'feature') }
       let(:fork_url) { namespace_project_commits_path(forked_project.namespace, forked_project, 'feature') }
     end

spec/features/projects/wiki/markdown_preview_spec.rb

@@ -24,12 +24,16 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
   context "while creating a new wiki page" do
     context "when there are no spaces or hyphens in the page name" do
       it "rewrites relative links as expected" do
-        click_link 'New Page'
-        fill_in :new_wiki_path, with: 'a/b/c/d'
-        click_button 'Create Page'
+        click_link 'New page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a/b/c/d'
+          click_button 'Create page'
+        end
 
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -42,12 +46,16 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
 
     context "when there are spaces in the page name" do
       it "rewrites relative links as expected" do
-        click_link 'New Page'
-        fill_in :new_wiki_path, with: 'a page/b page/c page/d page'
-        click_button 'Create Page'
+        click_link 'New page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a page/b page/c page/d page'
+          click_button 'Create page'
+        end
 
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -60,12 +68,16 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
 
     context "when there are hyphens in the page name" do
       it "rewrites relative links as expected" do
-        click_link 'New Page'
-        fill_in :new_wiki_path, with: 'a-page/b-page/c-page/d-page'
-        click_button 'Create Page'
-
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        click_link 'New page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a-page/b-page/c-page/d-page'
+          click_button 'Create page'
+        end
+        
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -79,11 +91,17 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
 
   context "while editing a wiki page" do
     def create_wiki_page(path)
-      click_link 'New Page'
-      fill_in :new_wiki_path, with: path
-      click_button 'Create Page'
-      fill_in :wiki_content, with: 'content'
-      click_on "Create page"
+      click_link 'New page'
+
+      page.within '#modal-new-wiki' do
+        fill_in :new_wiki_path, with: path
+        click_button 'Create page'
+      end
+
+      page.within '.wiki-form' do
+        fill_in :wiki_content, with: 'content'
+        click_on "Create page"
+      end
     end
 
     context "when there are no spaces or hyphens in the page name" do

spec/features/projects/wiki/user_creates_wiki_page_spec.rb

@@ -21,8 +21,9 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
 
       scenario 'directly from the wiki home page' do
         fill_in :wiki_content, with: 'My awesome wiki!'
-        click_button 'Create page'
-
+        page.within '.wiki-form' do
+          click_button 'Create page'
+        end
         expect(page).to have_content('Home')
         expect(page).to have_content("Last edited by #{user.name}")
         expect(page).to have_content('My awesome wiki!')
@@ -36,16 +37,20 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
 
       context 'via the "new wiki page" page' do
         scenario 'when the wiki page has a single word name', js: true do
-          click_link 'New Page'
+          click_link 'New page'
 
-          fill_in :new_wiki_path, with: 'foo'
-          click_button 'Create Page'
+          page.within '#modal-new-wiki' do
+            fill_in :new_wiki_path, with: 'foo'
+            click_button 'Create page'
+          end
 
           # Commit message field should have correct value.
           expect(page).to have_field('wiki[message]', with: 'Create foo')
 
-          fill_in :wiki_content, with: 'My awesome wiki!'
-          click_button 'Create page'
+          page.within '.wiki-form' do
+            fill_in :wiki_content, with: 'My awesome wiki!'
+            click_button 'Create page'
+          end
 
           expect(page).to have_content('Foo')
           expect(page).to have_content("Last edited by #{user.name}")
@@ -53,16 +58,20 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
         end
 
         scenario 'when the wiki page has spaces in the name', js: true do
-          click_link 'New Page'
+          click_link 'New page'
 
-          fill_in :new_wiki_path, with: 'Spaces in the name'
-          click_button 'Create Page'
+          page.within '#modal-new-wiki' do
+            fill_in :new_wiki_path, with: 'Spaces in the name'
+            click_button 'Create page'
+          end
 
           # Commit message field should have correct value.
           expect(page).to have_field('wiki[message]', with: 'Create spaces in the name')
 
-          fill_in :wiki_content, with: 'My awesome wiki!'
-          click_button 'Create page'
+          page.within '.wiki-form' do
+            fill_in :wiki_content, with: 'My awesome wiki!'
+            click_button 'Create page'
+          end
 
           expect(page).to have_content('Spaces in the name')
           expect(page).to have_content("Last edited by #{user.name}")
@@ -70,16 +79,20 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
         end
 
         scenario 'when the wiki page has hyphens in the name', js: true do
-          click_link 'New Page'
+          click_link 'New page'
 
-          fill_in :new_wiki_path, with: 'hyphens-in-the-name'
-          click_button 'Create Page'
+          page.within '#modal-new-wiki' do
+            fill_in :new_wiki_path, with: 'hyphens-in-the-name'
+            click_button 'Create page'
+          end
 
           # Commit message field should have correct value.
           expect(page).to have_field('wiki[message]', with: 'Create hyphens in the name')
 
-          fill_in :wiki_content, with: 'My awesome wiki!'
-          click_button 'Create page'
+          page.within '.wiki-form' do
+            fill_in :wiki_content, with: 'My awesome wiki!'
+            click_button 'Create page'
+          end
 
           expect(page).to have_content('Hyphens in the name')
           expect(page).to have_content("Last edited by #{user.name}")
@@ -99,7 +112,9 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
 
       scenario 'directly from the wiki home page' do
         fill_in :wiki_content, with: 'My awesome wiki!'
-        click_button 'Create page'
+        page.within '.wiki-form' do
+          click_button 'Create page'
+        end
 
         expect(page).to have_content('Home')
         expect(page).to have_content("Last edited by #{user.name}")
@@ -113,16 +128,20 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
       end
 
       scenario 'via the "new wiki page" page', js: true do
-        click_link 'New Page'
+        click_link 'New page'
 
-        fill_in :new_wiki_path, with: 'foo'
-        click_button 'Create Page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'foo'
+          click_button 'Create page'
+        end
 
         # Commit message field should have correct value.
         expect(page).to have_field('wiki[message]', with: 'Create foo')
 
-        fill_in :wiki_content, with: 'My awesome wiki!'
-        click_button 'Create page'
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: 'My awesome wiki!'
+          click_button 'Create page'
+        end
 
         expect(page).to have_content('Foo')
         expect(page).to have_content("Last edited by #{user.name}")

spec/features/tags/master_views_tags_spec.rb

@@ -16,7 +16,7 @@ feature 'Master views tags', feature: true do
       fill_in :commit_message, with: 'Add a README file', visible: true
       # Remove pre-receive hook so we can push without auth
       FileUtils.rm_f(File.join(project.repository.path, 'hooks', 'pre-receive'))
-      click_button 'Commit Changes'
+      click_button 'Commit changes'
       visit namespace_project_tags_path(project.namespace, project)
     end
 

spec/features/u2f_spec.rb

@@ -6,18 +6,18 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
   before { allow_any_instance_of(U2fHelper).to receive(:inject_u2f_api?).and_return(true) }
 
   def manage_two_factor_authentication
-    click_on 'Manage Two-Factor Authentication'
-    expect(page).to have_content("Setup New U2F Device")
+    click_on 'Manage two-factor authentication'
+    expect(page).to have_content("Setup new U2F device")
     wait_for_ajax
   end
 
   def register_u2f_device(u2f_device = nil, name: 'My device')
     u2f_device ||= FakeU2fDevice.new(page, name)
     u2f_device.respond_to_u2f_registration
-    click_on 'Setup New U2F Device'
+    click_on 'Setup new U2F device'
     expect(page).to have_content('Your device was successfully set up')
     fill_in "Pick a name", with: name
-    click_on 'Register U2F Device'
+    click_on 'Register U2F device'
     u2f_device
   end
 
@@ -34,9 +34,9 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
 
       it 'does not allow registering a new device' do
         visit profile_account_path
-        click_on 'Enable Two-Factor Authentication'
+        click_on 'Enable two-factor authentication'
 
-        expect(page).to have_button('Setup New U2F Device', disabled: true)
+        expect(page).to have_button('Setup new U2F device', disabled: true)
       end
     end
 
@@ -111,9 +111,9 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
 
         # Have the "u2f device" respond with bad data
         page.execute_script("u2f.register = function(_,_,_,callback) { callback('bad response'); };")
-        click_on 'Setup New U2F Device'
+        click_on 'Setup new U2F device'
         expect(page).to have_content('Your device was successfully set up')
-        click_on 'Register U2F Device'
+        click_on 'Register U2F device'
 
         expect(U2fRegistration.count).to eq(0)
         expect(page).to have_content("The form contains the following error")
@@ -126,9 +126,9 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
 
         # Failed registration
         page.execute_script("u2f.register = function(_,_,_,callback) { callback('bad response'); };")
-        click_on 'Setup New U2F Device'
+        click_on 'Setup new U2F device'
         expect(page).to have_content('Your device was successfully set up')
-        click_on 'Register U2F Device'
+        click_on 'Register U2F device'
         expect(page).to have_content("The form contains the following error")
 
         # Successful registration

spec/javascripts/u2f/register_spec.js

@@ -22,7 +22,7 @@ require('./mock_u2f_device');
     it('allows registering a U2F device', function() {
       var deviceResponse, inProgressMessage, registeredMessage, setupButton;
       setupButton = this.container.find("#js-setup-u2f-device");
-      expect(setupButton.text()).toBe('Setup New U2F Device');
+      expect(setupButton.text()).toBe('Setup new U2F device');
       setupButton.trigger('click');
       inProgressMessage = this.container.children("p");
       expect(inProgressMessage.text()).toContain("Trying to communicate with your device");