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
......@@ -160,7 +160,7 @@
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 @@
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
......
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 }
......
......@@ -3,14 +3,14 @@
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 @@ def register_u2f_device(u2f_device = nil, name: 'My device')
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 @@ def register_u2f_device(u2f_device = nil, name: 'My device')
# 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 @@ def register_u2f_device(u2f_device = nil, name: 'My device')
# 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")
......
......@@ -11,7 +11,7 @@ describe('Modal store', () => {
let issue2;
beforeEach(() => {
// Setup default state
// Set up default state
Store.store.issues = [];
Store.store.selectedIssues = [];
......
......@@ -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);
......
......@@ -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);
});
......
......@@ -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');
......
......@@ -82,7 +82,7 @@
.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 @@
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
......
......@@ -412,7 +412,7 @@
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)
......
......@@ -85,7 +85,7 @@ def init(opts = {})
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 @@ def component_timed_setup(component, install_dir:, version:, task:)
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)
......
# 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
......
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