Skip to content
Snippets Groups Projects
Commit 85ec04ea authored by Sean McGivern's avatar Sean McGivern
Browse files

Merge branch 'gt-fix-typos-in-lib' into 'master'

Fix typos in lib

See merge request gitlab-org/gitlab-ce!23106
parents 793be43b 566ba126
No related branches found
No related tags found
No related merge requests found
Showing
with 43 additions and 38 deletions
---
title: Fix typos in lib
merge_request: 23106
author: George Tsiolis
type: other
Loading
Loading
@@ -139,7 +139,7 @@ module Gitlab
ensure
duration = Gitlab::Metrics::System.monotonic_time - start
 
# Keep track, seperately, for the performance bar
# Keep track, separately, for the performance bar
self.query_time += duration
gitaly_controller_action_duration_seconds.observe(
current_transaction_labels.merge(gitaly_service: service.to_s, rpc: rpc.to_s),
Loading
Loading
Loading
Loading
@@ -161,14 +161,14 @@ module Gitlab
##
# Note: If provider does not return content_range, then we set it as we requested
# Provider: minio
# - When the file size is larger than requested Content-range, the Content-range is included in responces with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in responces with Net::HTTPPartialContent 206
# - When the file size is larger than requested Content-range, the Content-range is included in responses with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in responses with Net::HTTPPartialContent 206
# Provider: AWS
# - When the file size is larger than requested Content-range, the Content-range is included in responces with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in responces with Net::HTTPPartialContent 206
# - When the file size is larger than requested Content-range, the Content-range is included in responses with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in responses with Net::HTTPPartialContent 206
# Provider: GCS
# - When the file size is larger than requested Content-range, the Content-range is included in responces with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in responces with Net::HTTPOK 200
# - When the file size is larger than requested Content-range, the Content-range is included in responses with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in responses with Net::HTTPOK 200
@chunk_range ||= (chunk_start...(chunk_start + @chunk.bytesize))
end
 
Loading
Loading
Loading
Loading
@@ -11,8 +11,8 @@ module Gitlab
 
attr_reader :subject
 
def can?(user, action, overriden_subject = nil)
super(user, action, overriden_subject || subject)
def can?(user, action, overridden_subject = nil)
super(user, action, overridden_subject || subject)
end
 
# delegate all #can? queries to the subject
Loading
Loading
Loading
Loading
@@ -49,7 +49,7 @@ describe RegistrationsController do
end
 
it 'displays an error when the reCAPTCHA is not solved' do
# Without this, `verify_recaptcha` arbitraily returns true in test env
# Without this, `verify_recaptcha` arbitrarily returns true in test env
Recaptcha.configuration.skip_verify_env.delete('test')
 
post(:create, user_params)
Loading
Loading
Loading
Loading
@@ -89,7 +89,7 @@ describe SessionsController do
end
 
it 'displays an error when the reCAPTCHA is not solved' do
# Without this, `verify_recaptcha` arbitraily returns true in test env
# Without this, `verify_recaptcha` arbitrarily returns true in test env
Recaptcha.configuration.skip_verify_env.delete('test')
counter = double(:counter)
 
Loading
Loading
Loading
Loading
@@ -27,7 +27,7 @@ describe 'New/edit issue', :js do
before do
# Using `allow_any_instance_of`/`and_wrap_original`, `original` would
# somehow refer to the very block we defined to _wrap_ that method, instead of
# the original method, resulting in infinite recurison when called.
# the original method, resulting in infinite recursion when called.
# This is likely a bug with helper modules included into dynamically generated view classes.
# To work around this, we have to hold on to and call to the original implementation manually.
original_issue_dropdown_options = FormHelper.instance_method(:issue_assignees_dropdown_options)
Loading
Loading
Loading
Loading
@@ -55,11 +55,11 @@ describe 'User creates branch and merge request on issue page', :js do
test_branch_name_checking(input_branch_name)
test_source_checking(input_source)
 
# The button inside dropdown should be disabled if any errors occured.
# The button inside dropdown should be disabled if any errors occurred.
expect(page).to have_button('Create branch', disabled: true)
end
 
# The top level button should be disabled if any errors occured.
# The top level button should be disabled if any errors occurred.
expect(page).to have_button('Create branch', disabled: true)
end
 
Loading
Loading
Loading
Loading
@@ -719,7 +719,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
context 'on mobile', :js do
let(:job) { create(:ci_build, pipeline: pipeline) }
 
it 'renders collpased sidebar' do
it 'renders collapsed sidebar' do
page.current_window.resize_to(600, 800)
 
visit project_job_path(project, job)
Loading
Loading
@@ -738,7 +738,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
wait_for_requests
 
expect(page).to have_css('.js-job-sidebar.right-sidebar-expanded')
expect(page).not_to have_css('.js-job-sidebar.right-sidebar-collpased')
expect(page).not_to have_css('.js-job-sidebar.right-sidebar-collapsed')
end
end
 
Loading
Loading
Loading
Loading
@@ -2334,12 +2334,12 @@ Boards::Lists::MoveService
keeps position of lists when list type is closed
when list type is set to label
keeps position of lists when new position is nil
keeps position of lists when new positon is equal to old position
keeps position of lists when new positon is negative
keeps position of lists when new positon is equal to number of labels lists
keeps position of lists when new positon is greater than number of labels lists
increments position of intermediate lists when new positon is equal to first position
decrements position of intermediate lists when new positon is equal to last position
keeps position of lists when new position is equal to old position
keeps position of lists when new position is negative
keeps position of lists when new position is equal to number of labels lists
keeps position of lists when new position is greater than number of labels lists
increments position of intermediate lists when new position is equal to first position
decrements position of intermediate lists when new position is equal to last position
decrements position of intermediate lists when new position is greater than old position
increments position of intermediate lists when new position is lower than old position
when board parent is a group
Loading
Loading
@@ -2347,12 +2347,12 @@ Boards::Lists::MoveService
keeps position of lists when list type is closed
when list type is set to label
keeps position of lists when new position is nil
keeps position of lists when new positon is equal to old position
keeps position of lists when new positon is negative
keeps position of lists when new positon is equal to number of labels lists
keeps position of lists when new positon is greater than number of labels lists
increments position of intermediate lists when new positon is equal to first position
decrements position of intermediate lists when new positon is equal to last position
keeps position of lists when new position is equal to old position
keeps position of lists when new position is negative
keeps position of lists when new position is equal to number of labels lists
keeps position of lists when new position is greater than number of labels lists
increments position of intermediate lists when new position is equal to first position
decrements position of intermediate lists when new position is equal to last position
decrements position of intermediate lists when new position is greater than old position
increments position of intermediate lists when new position is lower than old position
 
Loading
Loading
Loading
Loading
@@ -16,7 +16,7 @@ describe Gitlab::Ci::Build::Policy::Refs do
end
end
 
context 'when maching tags' do
context 'when matching tags' do
context 'when pipeline runs for a tag' do
let(:pipeline) do
build_stubbed(:ci_pipeline, ref: 'feature', tag: true)
Loading
Loading
@@ -56,10 +56,10 @@ describe Gitlab::Ci::Build::Policy::Refs do
end
end
 
context 'when maching a source' do
context 'when matching a source' do
let(:pipeline) { build_stubbed(:ci_pipeline, source: :push) }
 
it 'is satisifed when provided source keyword matches' do
it 'is satisfied when provided source keyword matches' do
expect(described_class.new(%w[pushes]))
.to be_satisfied_by(pipeline)
end
Loading
Loading
Loading
Loading
@@ -8,7 +8,7 @@ describe Gitlab::Ci::Config::Entry::Artifacts do
let(:config) { { paths: %w[public/] } }
 
describe '#value' do
it 'returns artifacs configuration' do
it 'returns artifacts configuration' do
expect(entry.value).to eq config
end
end
Loading
Loading
Loading
Loading
@@ -58,7 +58,7 @@ describe Gitlab::Ci::Config::Entry::Policy do
end
 
context 'when using complex policy' do
context 'when specifiying refs policy' do
context 'when specifying refs policy' do
let(:config) { { refs: ['master'] } }
 
it 'is a correct configuraton' do
Loading
Loading
Loading
Loading
@@ -19,7 +19,7 @@ describe Gitlab::Ci::Config::Entry::Reports do
 
shared_examples 'a valid entry' do |keyword, file|
describe '#value' do
it 'returns artifacs configuration' do
it 'returns artifacts configuration' do
expect(entry.value).to eq({ "#{keyword}": [file] } )
end
end
Loading
Loading
Loading
Loading
@@ -94,7 +94,7 @@ describe Gitlab::Git::Commit, :seed_helper do
context 'body_size less than threshold' do
let(:body_size) { 123 }
 
it 'fetches commit message seperately' do
it 'fetches commit message separately' do
expect(described_class).to receive(:get_message).with(repository, id)
 
commit.safe_message
Loading
Loading
Loading
Loading
@@ -68,7 +68,7 @@ describe Gitlab::Git::Tag, :seed_helper do
context 'message_size less than threshold' do
let(:message_size) { 123 }
 
it 'fetches tag message seperately' do
it 'fetches tag message separately' do
expect(described_class).to receive(:get_message).with(repository, gitaly_tag.id)
 
tag.message
Loading
Loading
Loading
Loading
@@ -32,7 +32,7 @@ describe SystemHooksService do
end
 
it do
project.old_path_with_namespace = 'transfered_from_path'
project.old_path_with_namespace = 'transferred_from_path'
expect(event_data(project, :transfer)).to include(
:event_name, :name, :created_at, :updated_at, :path, :project_id,
:owner_name, :owner_email, :project_visibility,
Loading
Loading
Loading
Loading
@@ -101,7 +101,7 @@ describe EmailsOnPushWorker, :mailer do
 
context "when there are multiple recipients" do
before do
# This is a hack because we modify the mail object before sending, for efficency,
# This is a hack because we modify the mail object before sending, for efficiency,
# but the TestMailer adapter just appends the objects to an array. To clone a mail
# object, create a new one!
# https://github.com/mikel/mail/issues/314#issuecomment-12750108
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment