Merge branch 'fix-setup-grammar-3-ce' into 'master'

Fix grammar (setup to set-up) in code comments, spec, views, etc.

See merge request gitlab-org/gitlab-ce!21699

app/assets/javascripts/blob/3d_viewer/index.js

@@ -29,12 +29,12 @@ export default class Renderer {
 
     this.scene.add(this.camera);
 
-    // Setup the viewer
+    // Set up the viewer
     this.setupRenderer();
     this.setupGrid();
     this.setupLight();
 
-    // Setup OrbitControls
+    // Set up OrbitControls
     this.controls = new OrbitControls(
       this.camera,
       this.renderer.domElement,

app/assets/javascripts/feature_highlight/feature_highlight.js

@@ -16,7 +16,7 @@ export function setupFeatureHighlightPopover(id, debounceTimeout = 300) {
   const hideOnScroll = togglePopover.bind($selector, false);
 
   $selector
-    // Setup popover
+    // Set up popover
     .data('content', $popoverContent.prop('outerHTML'))
     .popover({
       html: true,

app/assets/javascripts/gl_form.js

@@ -18,7 +18,7 @@ export default class GLForm {
     });
     // Before we start, we should clean up any previous data for this form
     this.destroy();
-    // Setup the form
+    // Set up the form
     this.setupForm();
     this.form.data('glForm', this);
   }

app/assets/javascripts/notes.js

@@ -631,7 +631,7 @@ export default class Notes {
    *
    * deactivates the submit button when text is empty
    * hides the preview button when text is empty
-   * setup GFM auto complete
+   * set up GFM auto complete
    * show the form
    */
   setupNoteForm(form, enableGFM = defaultAutocompleteConfig) {
@@ -954,7 +954,7 @@ export default class Notes {
    * Note: dataHolder must have the "discussionId" and "lineCode" data attributes set.
    */
   setupDiscussionNoteForm(dataHolder, form) {
-    // setup note target
+    // set up note target
     let diffFileData = dataHolder.closest('.text-file');
 
     if (diffFileData.length === 0) {
@@ -1036,7 +1036,7 @@ export default class Notes {
 
     $diffFile[0].dispatchEvent(clickEvent);
 
-    // Setup comment form
+    // Set up comment form
     let newForm;
     const $noteContainer = $link.closest('.diff-viewer').find('.note-container');
     const $form = $noteContainer.find('> .discussion-form');

app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue

@@ -46,7 +46,7 @@ export default {
       }
     },
     basePath() {
-      // We might get the project path from rails with the relative url already setup
+      // We might get the project path from rails with the relative url already set up
       return this.projectPath.indexOf('/') === 0 ? '' : `${gon.relative_url_root}/`;
     },
     fullOldPath() {

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

@@ -3,7 +3,7 @@
 
   %fieldset
     %p
-      Setup InfluxDB to measure a wide variety of statistics like the time spent
+      Set up InfluxDB to measure a wide variety of statistics like the time spent
       in running SQL queries. These settings require a
       = link_to 'restart', help_page_path('administration/restart_gitlab')
       to take effect.

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

@@ -7,9 +7,9 @@
       .form-check
         = f.check_box :mirror_available, class: 'form-check-input'
         = f.label :mirror_available, class: 'form-check-label' do
-          Allow mirrors to be setup for projects
+          Allow mirrors to be set up for projects
       %span.form-text.text-muted
-        If disabled, only admins will be able to setup mirrors in projects.
+        If disabled, only admins will be able to set up mirrors in projects.
         = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')
 
   = f.submit 'Save changes', class: "btn btn-success"

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

@@ -31,7 +31,7 @@
       .form-check
         = f.check_box :require_two_factor_authentication, class: 'form-check-input'
         = f.label :require_two_factor_authentication, class: 'form-check-label' do
-          Require all users to setup Two-factor authentication
+          Require all users to set up Two-factor authentication
     .form-group
       = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'label-bold'
       = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0'

app/views/groups/_group_admin_settings.html.haml

@@ -17,7 +17,7 @@
       = f.check_box :require_two_factor_authentication, class: 'form-check-input'
       = f.label :require_two_factor_authentication, class: 'form-check-label' do
         %strong
-          Require all users in this group to setup Two-factor authentication
+          Require all users in this group to set up Two-factor authentication
           = link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group')
 .form-group.row
   .offset-sm-2.col-sm-10

app/views/profiles/passwords/new.html.haml

@@ -1,6 +1,6 @@
 - page_title    "New Password"
 - header_title  "New Password"
-%h3.page-title Setup new password
+%h3.page-title Set up new password
 %hr
 = form_for @user, url: profile_password_path, method: :post do |f|
   %p.slead

app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml

@@ -1,6 +1,6 @@
 - run_actions_text = "Perform common operations on GitLab project: #{@project.full_name}"
 
-%p To setup this service:
+%p To set up this service:
 %ul.list-unstyled.indent-list
   %li
     1.

app/views/projects/services/slack_slash_commands/_help.html.haml

@@ -14,7 +14,7 @@
       by entering
     %kbd.inline /<command> help
     - unless @service.template?
-      %p To setup this service:
+      %p To set up this service:
       %ul.list-unstyled.indent-list
         %li
           1.

app/views/u2f/_register.html.haml

@@ -8,13 +8,13 @@
   - if current_user.two_factor_otp_enabled?
     .row.append-bottom-10
       .col-md-4
-        %button#js-setup-u2f-device.btn.btn-info.btn-block Setup new U2F device
+        %button#js-setup-u2f-device.btn.btn-info.btn-block Set up new U2F device
       .col-md-8
         %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-4
-        %button#js-setup-u2f-device.btn.btn-info.btn-block{ disabled: true } Setup new U2F device
+        %button#js-setup-u2f-device.btn.btn-info.btn-block{ disabled: true } Set up new U2F device
       .col-md-8
         %p.text-warning You need to register a two-factor authentication app before you can set up a U2F device.
 

bin/setup

@@ -16,7 +16,7 @@ if rails5?
 end
 
 Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
+  # This script is a starting point to set up your application.
   # Add necessary setup steps to this file:
 
   puts "== Installing dependencies =="

config/gitlab.yml.example

@@ -760,8 +760,8 @@ test:
     host: localhost
     port: 80
 
-    # When you run tests we clone and setup gitlab-shell
-    # In order to setup it correctly you need to specify
+    # When you run tests we clone and set up gitlab-shell
+    # In order to set it up correctly you need to specify
     # your system username you use to run GitLab
     # user: YOUR_USERNAME
   pages:

config/initializers/devise.rb

@@ -71,7 +71,7 @@ Devise.setup do |config|
   # a value less than 10 in other environments.
   config.stretches = Rails.env.test? ? 1 : 10
 
-  # Setup a pepper to generate the encrypted password.
+  # Set up a pepper to generate the encrypted password.
   # config.pepper = "2ef62d549c4ff98a5d3e0ba211e72cff592060247e3bbbb9f499af1222f876f53d39b39b823132affb32858168c79c1d7741d26499901b63c6030a42129924ef"
 
   # ==> Configuration for :confirmable

lib/api/settings.rb

@@ -102,7 +102,7 @@ module API
       end
       optional :repository_checks_enabled, type: Boolean, desc: "GitLab will periodically run 'git fsck' in all project and wiki repositories to look for silent disk corruption issues."
       optional :repository_storages, type: Array[String], desc: 'Storage paths for new projects'
-      optional :require_two_factor_authentication, type: Boolean, desc: 'Require all users to setup Two-factor authentication'
+      optional :require_two_factor_authentication, type: Boolean, desc: 'Require all users to set up Two-factor authentication'
       given require_two_factor_authentication: ->(val) { val } do
         requires :two_factor_grace_period, type: Integer, desc: 'Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication'
       end

lib/system_check/incoming_email/imap_authentication_check.rb

@@ -7,7 +7,7 @@ module SystemCheck
         if config
           try_connect_imap
         else
-          @error = "#{mail_room_config_path} does not have mailboxes setup"
+          @error = "#{mail_room_config_path} does not have mailboxes set up"
           false
         end
       end

lib/tasks/gemojione.rake

@@ -86,7 +86,7 @@ namespace :gemojione do
     SPRITESHEET_WIDTH = 860
     SPRITESHEET_HEIGHT = 840
 
-    # Setup a map to rename image files
+    # Set up a map to rename image files
     emoji_unicode_string_to_name_map = {}
     Gitlab::Emoji.emojis.each do |name, emoji_hash|
       # Ignore aliases

qa/qa/factory/resource/kubernetes_cluster.rb

@@ -36,7 +36,7 @@ module QA
 
           if @install_helm_tiller
             Page::Project::Operations::Kubernetes::Show.perform do |page|
-              # We must wait a few seconds for permissions to be setup correctly for new cluster
+              # We must wait a few seconds for permissions to be set up correctly for new cluster
               sleep 10
 
               # Helm must be installed before everything else

spec/features/merge_request/user_sees_merge_widget_spec.rb

@@ -160,7 +160,7 @@ describe 'Merge request > User sees merge widget', :js do
     end
   end
 
-  context 'view merge request where project has CI setup but no CI status' do
+  context 'view merge request where project has CI set up but no CI status' do
     before do
       pipeline = create(:ci_pipeline, project: project,
                                       sha: merge_request.diff_head_sha,
@@ -178,7 +178,7 @@ describe 'Merge request > User sees merge widget', :js do
     end
   end
 
-  context 'view merge request in project with only-mwps setting enabled but no CI is setup' do
+  context 'view merge request in project with only-mwps setting enabled but no CI is set up' do
     before do
       visit project_merge_request_path(project_only_mwps, merge_request_in_only_mwps_project)
     end

spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Setup Mattermost slash commands', :js do
+describe 'Set up Mattermost slash commands', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:service) { project.create_mattermost_slash_commands_service }

spec/features/u2f_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
   def manage_two_factor_authentication
     click_on 'Manage two-factor authentication'
-    expect(page).to have_content("Setup new U2F device")
+    expect(page).to have_content("Set up new U2F device")
     wait_for_requests
   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 'Set up 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'
@@ -34,7 +34,7 @@ describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
         visit profile_account_path
         click_on 'Enable two-factor authentication'
 
-        expect(page).to have_button('Setup new U2F device', disabled: true)
+        expect(page).to have_button('Set up new U2F device', disabled: true)
       end
     end
 
@@ -109,7 +109,7 @@ describe '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 'Set up new U2F device'
         expect(page).to have_content('Your device was successfully set up')
         click_on 'Register U2F device'
 
@@ -124,7 +124,7 @@ describe '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 'Set up new U2F device'
         expect(page).to have_content('Your device was successfully set up')
         click_on 'Register U2F device'
         expect(page).to have_content("The form contains the following error")

spec/javascripts/boards/modal_store_spec.js

@@ -11,7 +11,7 @@ describe('Modal store', () => {
   let issue2;
 
   beforeEach(() => {
-    // Setup default state
+    // Set up default state
     Store.store.issues = [];
     Store.store.selectedIssues = [];
 

spec/javascripts/deploy_keys/components/app_spec.js

@@ -11,7 +11,7 @@ describe('Deploy keys app component', () => {
   let mock;
 
   beforeEach((done) => {
-    // setup axios mock before component
+    // set up axios mock before component
     mock = new MockAdapter(axios);
     mock.onGet(`${TEST_HOST}/dummy/`).replyOnce(200, data);
 

spec/javascripts/sidebar/sidebar_subscriptions_spec.js

@@ -12,7 +12,7 @@ describe('Sidebar Subscriptions', function () {
 
   beforeEach(() => {
     SidebarSubscriptions = Vue.extend(sidebarSubscriptions);
-    // Setup the stores, services, etc
+    // Set up the stores, services, etc
     // eslint-disable-next-line no-new
     new SidebarMediator(Mock.mediator);
   });

spec/javascripts/u2f/register_spec.js

@@ -16,7 +16,7 @@ describe('U2FRegister', function () {
 
   it('allows registering a U2F device', () => {
     const setupButton = this.container.find('#js-setup-u2f-device');
-    expect(setupButton.text()).toBe('Setup new U2F device');
+    expect(setupButton.text()).toBe('Set up new U2F device');
     setupButton.trigger('click');
     const inProgressMessage = this.container.children('p');
     expect(inProgressMessage.text()).toContain('Trying to communicate with your device');

spec/lib/mattermost/session_spec.rb

@@ -82,7 +82,7 @@ describe Mattermost::Session, type: :request do
             .to_return(headers: { Authorization: 'token thisworksnow' }, status: 200)
         end
 
-        it 'can setup a session' do
+        it 'can set up a session' do
           subject.with_session do |session|
           end
 
@@ -106,7 +106,7 @@ describe Mattermost::Session, type: :request do
         expect_to_obtain_exclusive_lease(lease_key, 'uuid')
         expect_to_cancel_exclusive_lease(lease_key, 'uuid')
 
-        # Cannot setup a session, but we should still cancel the lease
+        # Cannot set up a session, but we should still cancel the lease
         expect { subject.with_session }.to raise_error(Mattermost::NoSessionError)
       end
 

spec/presenters/project_presenter_spec.rb

@@ -412,7 +412,7 @@ describe ProjectPresenter do
     end
 
     describe '#koding_anchor_data' do
-      it 'returns link to setup Koding if user can push and no koding YML exists' do
+      it 'returns link to set up Koding if user can push and no koding YML exists' do
         project.add_developer(user)
         allow(project.repository).to receive(:koding_yml).and_return(nil)
         allow(Gitlab::CurrentSettings).to receive(:koding_enabled?).and_return(true)

spec/support/helpers/test_env.rb

@@ -85,7 +85,7 @@ module TestEnv
 
     clean_test_path
 
-    # Setup GitLab shell for test instance
+    # Set up GitLab shell for test instance
     setup_gitlab_shell
 
     setup_gitaly
@@ -367,7 +367,7 @@ module TestEnv
     FileUtils.rm_rf(install_dir)
     exit 1
   ensure
-    puts "    #{component} setup in #{Time.now - start} seconds...\n"
+    puts "    #{component} set up in #{Time.now - start} seconds...\n"
   end
 
   def ensure_component_dir_name_is_correct!(component, path)

vendor/gitlab-ci-yml/Swift.gitlab-ci.yml

@@ -1,5 +1,5 @@
 # Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/
-# This file assumes an own GitLab CI runner, setup on a macOS system.
+# This file assumes an own GitLab CI runner, set up on a macOS system.
 stages:
   - build
   - archive