Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
85ec04ea
Commit
85ec04ea
authored
6 years ago
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
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 merge requests found
Changes
18
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
43 additions
and
38 deletions
+43
-38
changelogs/unreleased/gt-fix-typos-in-lib.yml
changelogs/unreleased/gt-fix-typos-in-lib.yml
+5
-0
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+1
-1
lib/gitlab/http_io.rb
lib/gitlab/http_io.rb
+6
-6
lib/gitlab/view/presenter/base.rb
lib/gitlab/view/presenter/base.rb
+2
-2
spec/controllers/registrations_controller_spec.rb
spec/controllers/registrations_controller_spec.rb
+1
-1
spec/controllers/sessions_controller_spec.rb
spec/controllers/sessions_controller_spec.rb
+1
-1
spec/features/issues/form_spec.rb
spec/features/issues/form_spec.rb
+1
-1
spec/features/issues/user_creates_branch_and_merge_request_spec.rb
...ures/issues/user_creates_branch_and_merge_request_spec.rb
+2
-2
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+2
-2
spec/fixtures/trace/sample_trace
spec/fixtures/trace/sample_trace
+12
-12
spec/lib/gitlab/ci/build/policy/refs_spec.rb
spec/lib/gitlab/ci/build/policy/refs_spec.rb
+3
-3
spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
+1
-1
spec/lib/gitlab/ci/config/entry/policy_spec.rb
spec/lib/gitlab/ci/config/entry/policy_spec.rb
+1
-1
spec/lib/gitlab/ci/config/entry/reports_spec.rb
spec/lib/gitlab/ci/config/entry/reports_spec.rb
+1
-1
spec/lib/gitlab/git/commit_spec.rb
spec/lib/gitlab/git/commit_spec.rb
+1
-1
spec/lib/gitlab/git/tag_spec.rb
spec/lib/gitlab/git/tag_spec.rb
+1
-1
spec/services/system_hooks_service_spec.rb
spec/services/system_hooks_service_spec.rb
+1
-1
spec/workers/emails_on_push_worker_spec.rb
spec/workers/emails_on_push_worker_spec.rb
+1
-1
No files found.
changelogs/unreleased/gt-fix-typos-in-lib.yml
0 → 100644
View file @
85ec04ea
---
title
:
Fix typos in lib
merge_request
:
23106
author
:
George Tsiolis
type
:
other
This diff is collapsed.
Click to expand it.
lib/gitlab/gitaly_client.rb
View file @
85ec04ea
...
@@ -139,7 +139,7 @@ module Gitlab
...
@@ -139,7 +139,7 @@ module Gitlab
ensure
ensure
duration
=
Gitlab
::
Metrics
::
System
.
monotonic_time
-
start
duration
=
Gitlab
::
Metrics
::
System
.
monotonic_time
-
start
# Keep track, sep
e
rately, for the performance bar
# Keep track, sep
a
rately, for the performance bar
self
.
query_time
+=
duration
self
.
query_time
+=
duration
gitaly_controller_action_duration_seconds
.
observe
(
gitaly_controller_action_duration_seconds
.
observe
(
current_transaction_labels
.
merge
(
gitaly_service:
service
.
to_s
,
rpc:
rpc
.
to_s
),
current_transaction_labels
.
merge
(
gitaly_service:
service
.
to_s
,
rpc:
rpc
.
to_s
),
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/http_io.rb
View file @
85ec04ea
...
@@ -161,14 +161,14 @@ module Gitlab
...
@@ -161,14 +161,14 @@ module Gitlab
##
##
# Note: If provider does not return content_range, then we set it as we requested
# Note: If provider does not return content_range, then we set it as we requested
# Provider: minio
# Provider: minio
# - When the file size is larger than requested Content-range, the Content-range is included in respon
c
es with Net::HTTPPartialContent 206
# - When the file size is larger than requested Content-range, the Content-range is included in respon
s
es with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in respon
c
es with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in respon
s
es with Net::HTTPPartialContent 206
# Provider: AWS
# Provider: AWS
# - When the file size is larger than requested Content-range, the Content-range is included in respon
c
es with Net::HTTPPartialContent 206
# - When the file size is larger than requested Content-range, the Content-range is included in respon
s
es with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in respon
c
es with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in respon
s
es with Net::HTTPPartialContent 206
# Provider: GCS
# Provider: GCS
# - When the file size is larger than requested Content-range, the Content-range is included in respon
c
es with Net::HTTPPartialContent 206
# - When the file size is larger than requested Content-range, the Content-range is included in respon
s
es with Net::HTTPPartialContent 206
# - When the file size is smaller than requested Content-range, the Content-range is included in respon
c
es with Net::HTTPOK 200
# - When the file size is smaller than requested Content-range, the Content-range is included in respon
s
es with Net::HTTPOK 200
@chunk_range
||=
(
chunk_start
...
(
chunk_start
+
@chunk
.
bytesize
))
@chunk_range
||=
(
chunk_start
...
(
chunk_start
+
@chunk
.
bytesize
))
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/view/presenter/base.rb
View file @
85ec04ea
...
@@ -11,8 +11,8 @@ module Gitlab
...
@@ -11,8 +11,8 @@ module Gitlab
attr_reader
:subject
attr_reader
:subject
def
can?
(
user
,
action
,
overriden_subject
=
nil
)
def
can?
(
user
,
action
,
overrid
d
en_subject
=
nil
)
super
(
user
,
action
,
overriden_subject
||
subject
)
super
(
user
,
action
,
overrid
d
en_subject
||
subject
)
end
end
# delegate all #can? queries to the subject
# delegate all #can? queries to the subject
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/registrations_controller_spec.rb
View file @
85ec04ea
...
@@ -49,7 +49,7 @@ describe RegistrationsController do
...
@@ -49,7 +49,7 @@ describe RegistrationsController do
end
end
it
'displays an error when the reCAPTCHA is not solved'
do
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` arbitra
r
ily returns true in test env
Recaptcha
.
configuration
.
skip_verify_env
.
delete
(
'test'
)
Recaptcha
.
configuration
.
skip_verify_env
.
delete
(
'test'
)
post
(
:create
,
user_params
)
post
(
:create
,
user_params
)
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/sessions_controller_spec.rb
View file @
85ec04ea
...
@@ -89,7 +89,7 @@ describe SessionsController do
...
@@ -89,7 +89,7 @@ describe SessionsController do
end
end
it
'displays an error when the reCAPTCHA is not solved'
do
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` arbitra
r
ily returns true in test env
Recaptcha
.
configuration
.
skip_verify_env
.
delete
(
'test'
)
Recaptcha
.
configuration
.
skip_verify_env
.
delete
(
'test'
)
counter
=
double
(
:counter
)
counter
=
double
(
:counter
)
...
...
This diff is collapsed.
Click to expand it.
spec/features/issues/form_spec.rb
View file @
85ec04ea
...
@@ -27,7 +27,7 @@ describe 'New/edit issue', :js do
...
@@ -27,7 +27,7 @@ describe 'New/edit issue', :js do
before
do
before
do
# Using `allow_any_instance_of`/`and_wrap_original`, `original` would
# Using `allow_any_instance_of`/`and_wrap_original`, `original` would
# somehow refer to the very block we defined to _wrap_ that method, instead of
# somehow refer to the very block we defined to _wrap_ that method, instead of
# the original method, resulting in infinite recur
is
on when called.
# the original method, resulting in infinite recur
si
on when called.
# This is likely a bug with helper modules included into dynamically generated view classes.
# 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.
# 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
)
original_issue_dropdown_options
=
FormHelper
.
instance_method
(
:issue_assignees_dropdown_options
)
...
...
This diff is collapsed.
Click to expand it.
spec/features/issues/user_creates_branch_and_merge_request_spec.rb
View file @
85ec04ea
...
@@ -55,11 +55,11 @@ describe 'User creates branch and merge request on issue page', :js do
...
@@ -55,11 +55,11 @@ describe 'User creates branch and merge request on issue page', :js do
test_branch_name_checking
(
input_branch_name
)
test_branch_name_checking
(
input_branch_name
)
test_source_checking
(
input_source
)
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 occur
r
ed.
expect
(
page
).
to
have_button
(
'Create branch'
,
disabled:
true
)
expect
(
page
).
to
have_button
(
'Create branch'
,
disabled:
true
)
end
end
# The top level button should be disabled if any errors occured.
# The top level button should be disabled if any errors occur
r
ed.
expect
(
page
).
to
have_button
(
'Create branch'
,
disabled:
true
)
expect
(
page
).
to
have_button
(
'Create branch'
,
disabled:
true
)
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/features/projects/jobs_spec.rb
View file @
85ec04ea
...
@@ -719,7 +719,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
...
@@ -719,7 +719,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
context
'on mobile'
,
:js
do
context
'on mobile'
,
:js
do
let
(
:job
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:job
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
it
'renders coll
pa
sed sidebar'
do
it
'renders coll
ap
sed sidebar'
do
page
.
current_window
.
resize_to
(
600
,
800
)
page
.
current_window
.
resize_to
(
600
,
800
)
visit
project_job_path
(
project
,
job
)
visit
project_job_path
(
project
,
job
)
...
@@ -738,7 +738,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
...
@@ -738,7 +738,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_css
(
'.js-job-sidebar.right-sidebar-expanded'
)
expect
(
page
).
to
have_css
(
'.js-job-sidebar.right-sidebar-expanded'
)
expect
(
page
).
not_to
have_css
(
'.js-job-sidebar.right-sidebar-coll
pa
sed'
)
expect
(
page
).
not_to
have_css
(
'.js-job-sidebar.right-sidebar-coll
ap
sed'
)
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/fixtures/trace/sample_trace
View file @
85ec04ea
...
@@ -2334,12 +2334,12 @@ Boards::Lists::MoveService
...
@@ -2334,12 +2334,12 @@ Boards::Lists::MoveService
keeps position of lists when list type is closed
keeps position of lists when list type is closed
when list type is set to label
when list type is set to label
keeps position of lists when new position is nil
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 posit
i
on is equal to old position
keeps position of lists when new positon is negative
keeps position of lists when new posit
i
on is negative
keeps position of lists when new positon is equal to number of labels lists
keeps position of lists when new posit
i
on is equal to number of labels lists
keeps position of lists when new positon is greater than number of labels lists
keeps position of lists when new posit
i
on is greater than number of labels lists
increments position of intermediate lists when new positon is equal to first position
increments position of intermediate lists when new posit
i
on is equal to first position
decrements position of intermediate lists when new positon is equal to last position
decrements position of intermediate lists when new posit
i
on is equal to last position
decrements position of intermediate lists when new position is greater than old 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
increments position of intermediate lists when new position is lower than old position
when board parent is a group
when board parent is a group
...
@@ -2347,12 +2347,12 @@ Boards::Lists::MoveService
...
@@ -2347,12 +2347,12 @@ Boards::Lists::MoveService
keeps position of lists when list type is closed
keeps position of lists when list type is closed
when list type is set to label
when list type is set to label
keeps position of lists when new position is nil
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 posit
i
on is equal to old position
keeps position of lists when new positon is negative
keeps position of lists when new posit
i
on is negative
keeps position of lists when new positon is equal to number of labels lists
keeps position of lists when new posit
i
on is equal to number of labels lists
keeps position of lists when new positon is greater than number of labels lists
keeps position of lists when new posit
i
on is greater than number of labels lists
increments position of intermediate lists when new positon is equal to first position
increments position of intermediate lists when new posit
i
on is equal to first position
decrements position of intermediate lists when new positon is equal to last position
decrements position of intermediate lists when new posit
i
on is equal to last position
decrements position of intermediate lists when new position is greater than old 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
increments position of intermediate lists when new position is lower than old position
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/ci/build/policy/refs_spec.rb
View file @
85ec04ea
...
@@ -16,7 +16,7 @@ describe Gitlab::Ci::Build::Policy::Refs do
...
@@ -16,7 +16,7 @@ describe Gitlab::Ci::Build::Policy::Refs do
end
end
end
end
context
'when maching tags'
do
context
'when ma
t
ching tags'
do
context
'when pipeline runs for a tag'
do
context
'when pipeline runs for a tag'
do
let
(
:pipeline
)
do
let
(
:pipeline
)
do
build_stubbed
(
:ci_pipeline
,
ref:
'feature'
,
tag:
true
)
build_stubbed
(
:ci_pipeline
,
ref:
'feature'
,
tag:
true
)
...
@@ -56,10 +56,10 @@ describe Gitlab::Ci::Build::Policy::Refs do
...
@@ -56,10 +56,10 @@ describe Gitlab::Ci::Build::Policy::Refs do
end
end
end
end
context
'when maching a source'
do
context
'when ma
t
ching a source'
do
let
(
:pipeline
)
{
build_stubbed
(
:ci_pipeline
,
source: :push
)
}
let
(
:pipeline
)
{
build_stubbed
(
:ci_pipeline
,
source: :push
)
}
it
'is satis
if
ed when provided source keyword matches'
do
it
'is satis
fi
ed when provided source keyword matches'
do
expect
(
described_class
.
new
(
%w[pushes]
))
expect
(
described_class
.
new
(
%w[pushes]
))
.
to
be_satisfied_by
(
pipeline
)
.
to
be_satisfied_by
(
pipeline
)
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
View file @
85ec04ea
...
@@ -8,7 +8,7 @@ describe Gitlab::Ci::Config::Entry::Artifacts do
...
@@ -8,7 +8,7 @@ describe Gitlab::Ci::Config::Entry::Artifacts do
let
(
:config
)
{
{
paths:
%w[public/]
}
}
let
(
:config
)
{
{
paths:
%w[public/]
}
}
describe
'#value'
do
describe
'#value'
do
it
'returns artifacs configuration'
do
it
'returns artifac
t
s configuration'
do
expect
(
entry
.
value
).
to
eq
config
expect
(
entry
.
value
).
to
eq
config
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/ci/config/entry/policy_spec.rb
View file @
85ec04ea
...
@@ -58,7 +58,7 @@ describe Gitlab::Ci::Config::Entry::Policy do
...
@@ -58,7 +58,7 @@ describe Gitlab::Ci::Config::Entry::Policy do
end
end
context
'when using complex policy'
do
context
'when using complex policy'
do
context
'when specif
i
ying refs policy'
do
context
'when specifying refs policy'
do
let
(
:config
)
{
{
refs:
[
'master'
]
}
}
let
(
:config
)
{
{
refs:
[
'master'
]
}
}
it
'is a correct configuraton'
do
it
'is a correct configuraton'
do
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/ci/config/entry/reports_spec.rb
View file @
85ec04ea
...
@@ -19,7 +19,7 @@ describe Gitlab::Ci::Config::Entry::Reports do
...
@@ -19,7 +19,7 @@ describe Gitlab::Ci::Config::Entry::Reports do
shared_examples
'a valid entry'
do
|
keyword
,
file
|
shared_examples
'a valid entry'
do
|
keyword
,
file
|
describe
'#value'
do
describe
'#value'
do
it
'returns artifacs configuration'
do
it
'returns artifac
t
s configuration'
do
expect
(
entry
.
value
).
to
eq
({
"
#{
keyword
}
"
:
[
file
]
}
)
expect
(
entry
.
value
).
to
eq
({
"
#{
keyword
}
"
:
[
file
]
}
)
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/git/commit_spec.rb
View file @
85ec04ea
...
@@ -94,7 +94,7 @@ describe Gitlab::Git::Commit, :seed_helper do
...
@@ -94,7 +94,7 @@ describe Gitlab::Git::Commit, :seed_helper do
context
'body_size less than threshold'
do
context
'body_size less than threshold'
do
let
(
:body_size
)
{
123
}
let
(
:body_size
)
{
123
}
it
'fetches commit message sep
e
rately'
do
it
'fetches commit message sep
a
rately'
do
expect
(
described_class
).
to
receive
(
:get_message
).
with
(
repository
,
id
)
expect
(
described_class
).
to
receive
(
:get_message
).
with
(
repository
,
id
)
commit
.
safe_message
commit
.
safe_message
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/git/tag_spec.rb
View file @
85ec04ea
...
@@ -68,7 +68,7 @@ describe Gitlab::Git::Tag, :seed_helper do
...
@@ -68,7 +68,7 @@ describe Gitlab::Git::Tag, :seed_helper do
context
'message_size less than threshold'
do
context
'message_size less than threshold'
do
let
(
:message_size
)
{
123
}
let
(
:message_size
)
{
123
}
it
'fetches tag message sep
e
rately'
do
it
'fetches tag message sep
a
rately'
do
expect
(
described_class
).
to
receive
(
:get_message
).
with
(
repository
,
gitaly_tag
.
id
)
expect
(
described_class
).
to
receive
(
:get_message
).
with
(
repository
,
gitaly_tag
.
id
)
tag
.
message
tag
.
message
...
...
This diff is collapsed.
Click to expand it.
spec/services/system_hooks_service_spec.rb
View file @
85ec04ea
...
@@ -32,7 +32,7 @@ describe SystemHooksService do
...
@@ -32,7 +32,7 @@ describe SystemHooksService do
end
end
it
do
it
do
project
.
old_path_with_namespace
=
'transfered_from_path'
project
.
old_path_with_namespace
=
'transfer
r
ed_from_path'
expect
(
event_data
(
project
,
:transfer
)).
to
include
(
expect
(
event_data
(
project
,
:transfer
)).
to
include
(
:event_name
,
:name
,
:created_at
,
:updated_at
,
:path
,
:project_id
,
:event_name
,
:name
,
:created_at
,
:updated_at
,
:path
,
:project_id
,
:owner_name
,
:owner_email
,
:project_visibility
,
:owner_name
,
:owner_email
,
:project_visibility
,
...
...
This diff is collapsed.
Click to expand it.
spec/workers/emails_on_push_worker_spec.rb
View file @
85ec04ea
...
@@ -101,7 +101,7 @@ describe EmailsOnPushWorker, :mailer do
...
@@ -101,7 +101,7 @@ describe EmailsOnPushWorker, :mailer do
context
"when there are multiple recipients"
do
context
"when there are multiple recipients"
do
before
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 effic
i
ency,
# but the TestMailer adapter just appends the objects to an array. To clone a mail
# but the TestMailer adapter just appends the objects to an array. To clone a mail
# object, create a new one!
# object, create a new one!
# https://github.com/mikel/mail/issues/314#issuecomment-12750108
# https://github.com/mikel/mail/issues/314#issuecomment-12750108
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment