Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
566ba126
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
566ba126
编写于
11月 15, 2018
作者:
G
George Tsiolis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typos in lib
上级
64c35c74
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
43 addition
and
38 deletion
+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
未找到文件。
changelogs/unreleased/gt-fix-typos-in-lib.yml
0 → 100644
浏览文件 @
566ba126
---
title
:
Fix typos in lib
merge_request
:
23106
author
:
George Tsiolis
type
:
other
lib/gitlab/gitaly_client.rb
浏览文件 @
566ba126
...
...
@@ -139,7 +139,7 @@ module Gitlab
ensure
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
gitaly_controller_action_duration_seconds
.
observe
(
current_transaction_labels
.
merge
(
gitaly_service:
service
.
to_s
,
rpc:
rpc
.
to_s
),
...
...
lib/gitlab/http_io.rb
浏览文件 @
566ba126
...
...
@@ -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 respon
c
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 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
s
es with Net::HTTPPartialContent 206
# 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 smaller 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
s
es with Net::HTTPPartialContent 206
# 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 smaller than requested Content-range, the Content-range is included in respon
c
es with Net::HTTPOK 200
# - 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
s
es with Net::HTTPOK 200
@chunk_range
||=
(
chunk_start
...
(
chunk_start
+
@chunk
.
bytesize
))
end
...
...
lib/gitlab/view/presenter/base.rb
浏览文件 @
566ba126
...
...
@@ -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
,
overrid
d
en_subject
=
nil
)
super
(
user
,
action
,
overrid
d
en_subject
||
subject
)
end
# delegate all #can? queries to the subject
...
...
spec/controllers/registrations_controller_spec.rb
浏览文件 @
566ba126
...
...
@@ -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` arbitra
r
ily returns true in test env
Recaptcha
.
configuration
.
skip_verify_env
.
delete
(
'test'
)
post
(
:create
,
user_params
)
...
...
spec/controllers/sessions_controller_spec.rb
浏览文件 @
566ba126
...
...
@@ -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` arbitra
r
ily returns true in test env
Recaptcha
.
configuration
.
skip_verify_env
.
delete
(
'test'
)
counter
=
double
(
:counter
)
...
...
spec/features/issues/form_spec.rb
浏览文件 @
566ba126
...
...
@@ -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 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.
# 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
)
...
...
spec/features/issues/user_creates_branch_and_merge_request_spec.rb
浏览文件 @
566ba126
...
...
@@ -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 occur
r
ed.
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 occur
r
ed.
expect
(
page
).
to
have_button
(
'Create branch'
,
disabled:
true
)
end
...
...
spec/features/projects/jobs_spec.rb
浏览文件 @
566ba126
...
...
@@ -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 coll
pa
sed sidebar'
do
it
'renders coll
ap
sed sidebar'
do
page
.
current_window
.
resize_to
(
600
,
800
)
visit
project_job_path
(
project
,
job
)
...
...
@@ -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-coll
pa
sed'
)
expect
(
page
).
not_to
have_css
(
'.js-job-sidebar.right-sidebar-coll
ap
sed'
)
end
end
...
...
spec/fixtures/trace/sample_trace
浏览文件 @
566ba126
...
...
@@ -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 posit
i
on is equal to old position
keeps position of lists when new posit
i
on is negative
keeps position of lists when new posit
i
on is equal to 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 posit
i
on is equal to first 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
increments position of intermediate lists when new position is lower than old position
when board parent is a group
...
...
@@ -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 posit
i
on is equal to old position
keeps position of lists when new posit
i
on is negative
keeps position of lists when new posit
i
on is equal to 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 posit
i
on is equal to first 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
increments position of intermediate lists when new position is lower than old position
...
...
spec/lib/gitlab/ci/build/policy/refs_spec.rb
浏览文件 @
566ba126
...
...
@@ -16,7 +16,7 @@ describe Gitlab::Ci::Build::Policy::Refs do
end
end
context
'when maching tags'
do
context
'when ma
t
ching tags'
do
context
'when pipeline runs for a tag'
do
let
(
:pipeline
)
do
build_stubbed
(
:ci_pipeline
,
ref:
'feature'
,
tag:
true
)
...
...
@@ -56,10 +56,10 @@ describe Gitlab::Ci::Build::Policy::Refs do
end
end
context
'when maching a source'
do
context
'when ma
t
ching a source'
do
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]
))
.
to
be_satisfied_by
(
pipeline
)
end
...
...
spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
浏览文件 @
566ba126
...
...
@@ -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 artifac
t
s configuration'
do
expect
(
entry
.
value
).
to
eq
config
end
end
...
...
spec/lib/gitlab/ci/config/entry/policy_spec.rb
浏览文件 @
566ba126
...
...
@@ -58,7 +58,7 @@ describe Gitlab::Ci::Config::Entry::Policy do
end
context
'when using complex policy'
do
context
'when specif
i
ying refs policy'
do
context
'when specifying refs policy'
do
let
(
:config
)
{
{
refs:
[
'master'
]
}
}
it
'is a correct configuraton'
do
...
...
spec/lib/gitlab/ci/config/entry/reports_spec.rb
浏览文件 @
566ba126
...
...
@@ -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 artifac
t
s configuration'
do
expect
(
entry
.
value
).
to
eq
({
"
#{
keyword
}
"
:
[
file
]
}
)
end
end
...
...
spec/lib/gitlab/git/commit_spec.rb
浏览文件 @
566ba126
...
...
@@ -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 sep
e
rately'
do
it
'fetches commit message sep
a
rately'
do
expect
(
described_class
).
to
receive
(
:get_message
).
with
(
repository
,
id
)
commit
.
safe_message
...
...
spec/lib/gitlab/git/tag_spec.rb
浏览文件 @
566ba126
...
...
@@ -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 sep
e
rately'
do
it
'fetches tag message sep
a
rately'
do
expect
(
described_class
).
to
receive
(
:get_message
).
with
(
repository
,
gitaly_tag
.
id
)
tag
.
message
...
...
spec/services/system_hooks_service_spec.rb
浏览文件 @
566ba126
...
...
@@ -32,7 +32,7 @@ describe SystemHooksService do
end
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
(
:event_name
,
:name
,
:created_at
,
:updated_at
,
:path
,
:project_id
,
:owner_name
,
:owner_email
,
:project_visibility
,
...
...
spec/workers/emails_on_push_worker_spec.rb
浏览文件 @
566ba126
...
...
@@ -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 effic
i
ency,
# 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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录