Read about our upcoming Code of Conduct on this issue

Commit 32ae1afa authored by Douwe Maan's avatar Douwe Maan
Browse files

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
...@@ -29,12 +29,12 @@ export default class Renderer { ...@@ -29,12 +29,12 @@ export default class Renderer {
this.scene.add(this.camera); this.scene.add(this.camera);
// Setup the viewer // Set up the viewer
this.setupRenderer(); this.setupRenderer();
this.setupGrid(); this.setupGrid();
this.setupLight(); this.setupLight();
// Setup OrbitControls // Set up OrbitControls
this.controls = new OrbitControls( this.controls = new OrbitControls(
this.camera, this.camera,
this.renderer.domElement, this.renderer.domElement,
......
...@@ -16,7 +16,7 @@ export function setupFeatureHighlightPopover(id, debounceTimeout = 300) { ...@@ -16,7 +16,7 @@ export function setupFeatureHighlightPopover(id, debounceTimeout = 300) {
const hideOnScroll = togglePopover.bind($selector, false); const hideOnScroll = togglePopover.bind($selector, false);
$selector $selector
// Setup popover // Set up popover
.data('content', $popoverContent.prop('outerHTML')) .data('content', $popoverContent.prop('outerHTML'))
.popover({ .popover({
html: true, html: true,
......
...@@ -18,7 +18,7 @@ export default class GLForm { ...@@ -18,7 +18,7 @@ export default class GLForm {
}); });
// Before we start, we should clean up any previous data for this form // Before we start, we should clean up any previous data for this form
this.destroy(); this.destroy();
// Setup the form // Set up the form
this.setupForm(); this.setupForm();
this.form.data('glForm', this); this.form.data('glForm', this);
} }
......
...@@ -631,7 +631,7 @@ export default class Notes { ...@@ -631,7 +631,7 @@ export default class Notes {
* *
* deactivates the submit button when text is empty * deactivates the submit button when text is empty
* hides the preview 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 * show the form
*/ */
setupNoteForm(form, enableGFM = defaultAutocompleteConfig) { setupNoteForm(form, enableGFM = defaultAutocompleteConfig) {
...@@ -954,7 +954,7 @@ export default class Notes { ...@@ -954,7 +954,7 @@ export default class Notes {
* Note: dataHolder must have the "discussionId" and "lineCode" data attributes set. * Note: dataHolder must have the "discussionId" and "lineCode" data attributes set.
*/ */
setupDiscussionNoteForm(dataHolder, form) { setupDiscussionNoteForm(dataHolder, form) {
// setup note target // set up note target
let diffFileData = dataHolder.closest('.text-file'); let diffFileData = dataHolder.closest('.text-file');
if (diffFileData.length === 0) { if (diffFileData.length === 0) {
...@@ -1036,7 +1036,7 @@ export default class Notes { ...@@ -1036,7 +1036,7 @@ export default class Notes {
$diffFile[0].dispatchEvent(clickEvent); $diffFile[0].dispatchEvent(clickEvent);
// Setup comment form // Set up comment form
let newForm; let newForm;
const $noteContainer = $link.closest('.diff-viewer').find('.note-container'); const $noteContainer = $link.closest('.diff-viewer').find('.note-container');
const $form = $noteContainer.find('> .discussion-form'); const $form = $noteContainer.find('> .discussion-form');
......
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
} }
}, },
basePath() { 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}/`; return this.projectPath.indexOf('/') === 0 ? '' : `${gon.relative_url_root}/`;
}, },
fullOldPath() { fullOldPath() {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%fieldset %fieldset
%p %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 in running SQL queries. These settings require a
= link_to 'restart', help_page_path('administration/restart_gitlab') = link_to 'restart', help_page_path('administration/restart_gitlab')
to take effect. to take effect.
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
.form-check .form-check
= f.check_box :mirror_available, class: 'form-check-input' = f.check_box :mirror_available, class: 'form-check-input'
= f.label :mirror_available, class: 'form-check-label' do = 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 %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') = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')
= f.submit 'Save changes', class: "btn btn-success" = f.submit 'Save changes', class: "btn btn-success"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.form-check .form-check
= f.check_box :require_two_factor_authentication, class: 'form-check-input' = f.check_box :require_two_factor_authentication, class: 'form-check-input'
= f.label :require_two_factor_authentication, class: 'form-check-label' do = 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 .form-group
= f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'label-bold' = 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' = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0'
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= f.check_box :require_two_factor_authentication, class: 'form-check-input' = f.check_box :require_two_factor_authentication, class: 'form-check-input'
= f.label :require_two_factor_authentication, class: 'form-check-label' do = f.label :require_two_factor_authentication, class: 'form-check-label' do
%strong %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') = link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group')
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
......
- page_title "New Password" - page_title "New Password"
- header_title "New Password" - header_title "New Password"
%h3.page-title Setup new password %h3.page-title Set up new password
%hr %hr
= form_for @user, url: profile_password_path, method: :post do |f| = form_for @user, url: profile_password_path, method: :post do |f|
%p.slead %p.slead
......
- run_actions_text = "Perform common operations on GitLab project: #{@project.full_name}" - 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 %ul.list-unstyled.indent-list
%li %li
1. 1.
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
by entering by entering
%kbd.inline /<command> help %kbd.inline /<command> help
- unless @service.template? - unless @service.template?
%p To setup this service: %p To set up this service:
%ul.list-unstyled.indent-list %ul.list-unstyled.indent-list
%li %li
1. 1.
......
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
- if current_user.two_factor_otp_enabled? - if current_user.two_factor_otp_enabled?
.row.append-bottom-10 .row.append-bottom-10
.col-md-4 .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 .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. %p Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left.
- else - else
.row.append-bottom-10 .row.append-bottom-10
.col-md-4 .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 .col-md-8
%p.text-warning You need to register a two-factor authentication app before you can set up a U2F device. %p.text-warning You need to register a two-factor authentication app before you can set up a U2F device.
......
...@@ -16,7 +16,7 @@ if rails5? ...@@ -16,7 +16,7 @@ if rails5?
end end
Dir.chdir APP_ROOT do 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: # Add necessary setup steps to this file:
puts "== Installing dependencies ==" puts "== Installing dependencies =="
......
...@@ -760,8 +760,8 @@ test: ...@@ -760,8 +760,8 @@ test:
host: localhost host: localhost
port: 80 port: 80
# When you run tests we clone and setup gitlab-shell # When you run tests we clone and set up gitlab-shell
# In order to setup it correctly you need to specify # In order to set it up correctly you need to specify
# your system username you use to run GitLab # your system username you use to run GitLab
# user: YOUR_USERNAME # user: YOUR_USERNAME
pages: pages:
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
# a value less than 10 in other environments. # a value less than 10 in other environments.
config.stretches = Rails.env.test? ? 1 : 10 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" # config.pepper = "2ef62d549c4ff98a5d3e0ba211e72cff592060247e3bbbb9f499af1222f876f53d39b39b823132affb32858168c79c1d7741d26499901b63c6030a42129924ef"
# ==> Configuration for :confirmable # ==> Configuration for :confirmable
......
...@@ -102,7 +102,7 @@ def current_settings ...@@ -102,7 +102,7 @@ def current_settings
end 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_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 :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 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' 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 end
......
...@@ -7,7 +7,7 @@ def check? ...@@ -7,7 +7,7 @@ def check?
if config if config
try_connect_imap try_connect_imap
else else
@error = "#{mail_room_config_path} does not have mailboxes setup" @error = "#{mail_room_config_path} does not have mailboxes set up"
false false
end end
end end
......
...@@ -86,7 +86,7 @@ namespace :gemojione do ...@@ -86,7 +86,7 @@ namespace :gemojione do
SPRITESHEET_WIDTH = 860 SPRITESHEET_WIDTH = 860
SPRITESHEET_HEIGHT = 840 SPRITESHEET_HEIGHT = 840
# Setup a map to rename image files # Set up a map to rename image files
emoji_unicode_string_to_name_map = {} emoji_unicode_string_to_name_map = {}
Gitlab::Emoji.emojis.each do |name, emoji_hash| Gitlab::Emoji.emojis.each do |name, emoji_hash|
# Ignore aliases # Ignore aliases
......
...@@ -36,7 +36,7 @@ def fabricate! ...@@ -36,7 +36,7 @@ def fabricate!
if @install_helm_tiller if @install_helm_tiller
Page::Project::Operations::Kubernetes::Show.perform do |page| 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 sleep 10
# Helm must be installed before everything else # Helm must be installed before everything else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment