Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cae2c336
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,发现更多精彩内容 >>
未验证
提交
cae2c336
编写于
2月 25, 2019
作者:
M
Michael Kozono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Merge branch 'fix-misspellings-app-comments' into 'master'"
This reverts commit
9202bbd1
, reversing changes made to
4b282e9c
.
上级
ea6945b8
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
24 addition
and
24 deletion
+24
-24
app/assets/javascripts/releases/store/actions.js
app/assets/javascripts/releases/store/actions.js
+1
-1
app/controllers/clusters/clusters_controller.rb
app/controllers/clusters/clusters_controller.rb
+1
-1
app/controllers/concerns/lfs_request.rb
app/controllers/concerns/lfs_request.rb
+1
-1
app/finders/group_descendants_finder.rb
app/finders/group_descendants_finder.rb
+1
-1
app/helpers/count_helper.rb
app/helpers/count_helper.rb
+1
-1
app/models/ci/build_trace_chunk.rb
app/models/ci/build_trace_chunk.rb
+1
-1
app/models/concerns/fast_destroy_all.rb
app/models/concerns/fast_destroy_all.rb
+1
-1
app/models/concerns/iid_routes.rb
app/models/concerns/iid_routes.rb
+1
-1
app/models/notification_recipient.rb
app/models/notification_recipient.rb
+1
-1
app/models/project.rb
app/models/project.rb
+3
-3
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+2
-2
app/services/ci/pipeline_trigger_service.rb
app/services/ci/pipeline_trigger_service.rb
+2
-2
app/services/git_push_service.rb
app/services/git_push_service.rb
+1
-1
app/services/git_tag_push_service.rb
app/services/git_tag_push_service.rb
+1
-1
app/services/groups/create_service.rb
app/services/groups/create_service.rb
+1
-1
app/services/groups/update_service.rb
app/services/groups/update_service.rb
+1
-1
app/services/system_note_service.rb
app/services/system_note_service.rb
+1
-1
spec/features/issues/gfm_autocomplete_spec.rb
spec/features/issues/gfm_autocomplete_spec.rb
+1
-1
spec/features/projects/blobs/edit_spec.rb
spec/features/projects/blobs/edit_spec.rb
+1
-1
spec/features/projects/wiki/markdown_preview_spec.rb
spec/features/projects/wiki/markdown_preview_spec.rb
+1
-1
未找到文件。
app/assets/javascripts/releases/store/actions.js
浏览文件 @
cae2c336
...
...
@@ -11,7 +11,7 @@ export const requestReleases = ({ commit }) => commit(types.REQUEST_RELEASES);
/**
* Fetches the main endpoint.
* Will dispatch requestNamespace action before starting the request.
* Will dispatch receiveNamespaceSuccess if the request is successful
* Will dispatch receiveNamespaceSuccess if the request is successful
l
* Will dispatch receiveNamesapceError if the request returns an error
*
* @param {String} projectId
...
...
app/controllers/clusters/clusters_controller.rb
浏览文件 @
cae2c336
...
...
@@ -24,7 +24,7 @@ class Clusters::ClustersController < Clusters::BaseController
# Note: We are paginating through an array here but this should OK as:
#
# In CE, we can have a maximum group nesting depth of 21, so including
# project cluster, we can have max 22 clusters for a group hiera
r
chy.
# project cluster, we can have max 22 clusters for a group hierachy.
# In EE (Premium) we can have any number, as multiple clusters are
# supported, but the number of clusters are fairly low currently.
#
...
...
app/controllers/concerns/lfs_request.rb
浏览文件 @
cae2c336
...
...
@@ -123,7 +123,7 @@ module LfsRequest
(
authentication_abilities
||
[]).
include?
(
capability
)
end
# Overrid
d
en in EE
# Overriden in EE
def
limit_exceeded?
false
end
...
...
app/finders/group_descendants_finder.rb
浏览文件 @
cae2c336
...
...
@@ -134,7 +134,7 @@ class GroupDescendantsFinder
def
subgroups
return
Group
.
none
unless
Group
.
supports_nested_objects?
# When filtering subgroups, we want to find all matches within the tree of
# When filtering subgroups, we want to find all matches within
g
the tree of
# descendants to show to the user
groups
=
if
params
[
:filter
]
subgroups_matching_filter
...
...
app/helpers/count_helper.rb
浏览文件 @
cae2c336
...
...
@@ -13,7 +13,7 @@ module CountHelper
# memberships, and deducting 1 for each root of the fork network.
# This might be inacurate as the root of the fork network might have been deleted.
#
# This makes querying this information a lot more eff
i
cient and it should be
# This makes querying this information a lot more eff
e
cient and it should be
# accurate enough for the instance wide statistics
def
approximate_fork_count_with_delimiters
(
count_data
)
fork_network_count
=
count_data
[
ForkNetwork
]
...
...
app/models/ci/build_trace_chunk.rb
浏览文件 @
cae2c336
...
...
@@ -18,7 +18,7 @@ module Ci
FailedToPersistDataError
=
Class
.
new
(
StandardError
)
# Note: The ordering of this enum is related to the precedence of persist store.
# The bottom item takes the hig
h
est precedence, and the top item takes the lowest precedence.
# The bottom item takes the higest precedence, and the top item takes the lowest precedence.
enum
data_store:
{
redis:
1
,
database:
2
,
...
...
app/models/concerns/fast_destroy_all.rb
浏览文件 @
cae2c336
...
...
@@ -11,7 +11,7 @@
# it is difficult to accomplish it.
#
# This module defines a format to use `delete_all` and delete associated external data.
# Here is an ex
am
ple
# Here is an ex
ma
ple
#
# Situation
# - `Project` has many `Ci::BuildTraceChunk` through `Ci::Build`
...
...
app/models/concerns/iid_routes.rb
浏览文件 @
cae2c336
...
...
@@ -4,7 +4,7 @@ module IidRoutes
##
# This automagically enforces all related routes to use `iid` instead of `id`
# If you want to use `iid` for some routes and `id` for other routes, this module should not to be included,
# instead you should define `iid` or `id` explic
i
tly at each route generators. e.g. pipeline_path(project.id, pipeline.iid)
# instead you should define `iid` or `id` explictly at each route generators. e.g. pipeline_path(project.id, pipeline.iid)
def
to_param
iid
.
to_s
end
...
...
app/models/notification_recipient.rb
浏览文件 @
cae2c336
...
...
@@ -153,7 +153,7 @@ class NotificationRecipient
user
.
global_notification_setting
end
# Returns the notificat
i
on_setting of the lowest group in hierarchy with non global level
# Returns the notificaton_setting of the lowest group in hierarchy with non global level
def
closest_non_global_group_notification_settting
return
unless
@group
return
if
indexed_group_notification_settings
.
empty?
...
...
app/models/project.rb
浏览文件 @
cae2c336
...
...
@@ -248,10 +248,10 @@ class Project < ActiveRecord::Base
has_many
:container_repositories
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:commit_statuses
# The relation :all_pipelines is inten
d
ed to be used when we want to get the
# The relation :all_pipelines is inten
t
ed to be used when we want to get the
# whole list of pipelines associated to the project
has_many
:all_pipelines
,
class_name:
'Ci::Pipeline'
,
inverse_of: :project
# The relation :ci_pipelines is inten
d
ed to be used when we want to get only
# The relation :ci_pipelines is inten
t
ed to be used when we want to get only
# those pipeline which are directly related to CI. There are
# other pipelines, like webide ones, that we won't retrieve
# if we use this relation.
...
...
@@ -1215,7 +1215,7 @@ class Project < ActiveRecord::Base
"
#{
web_url
}
.git"
end
# Is overrid
d
en in EE
# Is overriden in EE
def
lfs_http_url_to_repo
(
_
)
http_url_to_repo
end
...
...
app/services/ci/create_pipeline_service.rb
浏览文件 @
cae2c336
...
...
@@ -112,10 +112,10 @@ module Ci
def
extra_options
(
options
=
{})
# In Ruby 2.4, even when options is empty, f(**options) doesn't work when f
# doesn't have any parameters. We reproduce the Ruby 2.5 behavior by
# checking explicitly that no arguments are given.
# checking explicit
e
ly that no arguments are given.
raise
ArgumentError
if
options
.
any?
{}
# overrid
d
en in EE
{}
# overriden in EE
end
end
end
app/services/ci/pipeline_trigger_service.rb
浏览文件 @
cae2c336
...
...
@@ -38,11 +38,11 @@ module Ci
end
def
create_pipeline_from_job
(
job
)
# overrid
d
en in EE
# overriden in EE
end
def
job_from_token
# overrid
d
en in EE
# overriden in EE
end
def
variables
...
...
app/services/git_push_service.rb
浏览文件 @
cae2c336
...
...
@@ -235,6 +235,6 @@ class GitPushService < BaseService
private
def
pipeline_options
{}
# to be overrid
d
en in EE
{}
# to be overriden in EE
end
end
app/services/git_tag_push_service.rb
浏览文件 @
cae2c336
...
...
@@ -61,6 +61,6 @@ class GitTagPushService < BaseService
end
def
pipeline_options
{}
# to be overrid
d
en in EE
{}
# to be overriden in EE
end
end
app/services/groups/create_service.rb
浏览文件 @
cae2c336
...
...
@@ -33,7 +33,7 @@ module Groups
private
def
after_build_hook
(
group
,
params
)
# overrid
d
en in EE
# overriden in EE
end
def
create_chat_team?
...
...
app/services/groups/update_service.rb
浏览文件 @
cae2c336
...
...
@@ -31,7 +31,7 @@ module Groups
private
def
before_assignment_hook
(
group
,
params
)
# overrid
d
en in EE
# overriden in EE
end
def
after_update
...
...
app/services/system_note_service.rb
浏览文件 @
cae2c336
...
...
@@ -360,7 +360,7 @@ module SystemNoteService
# author - User performing the change
# branch_type - 'source' or 'target'
# old_branch - old branch name
# new_branch - new branch n
am
e
# new_branch - new branch n
ma
e
#
# Example Note text:
#
...
...
spec/features/issues/gfm_autocomplete_spec.rb
浏览文件 @
cae2c336
...
...
@@ -278,7 +278,7 @@ describe 'GFM autocomplete', :js do
end
end
# This context has j
us
t one example in each contexts in order to improve spec performance.
# This context has j
su
t one example in each contexts in order to improve spec performance.
context
'labels'
,
:quarantine
do
let!
(
:backend
)
{
create
(
:label
,
project:
project
,
title:
'backend'
)
}
let!
(
:bug
)
{
create
(
:label
,
project:
project
,
title:
'bug'
)
}
...
...
spec/features/projects/blobs/edit_spec.rb
浏览文件 @
cae2c336
...
...
@@ -77,7 +77,7 @@ describe 'Editing file blob', :js do
click_link
'Preview'
wait_for_requests
# the above generates two sep
a
rate lists (not embedded) in CommonMark
# the above generates two sep
e
rate lists (not embedded) in CommonMark
expect
(
page
).
to
have_content
(
"sublist"
)
expect
(
page
).
not_to
have_xpath
(
"//ol//li//ul"
)
end
...
...
spec/features/projects/wiki/markdown_preview_spec.rb
浏览文件 @
cae2c336
...
...
@@ -170,7 +170,7 @@ describe 'Projects > Wiki > User previews markdown changes', :js do
fill_in
:wiki_content
,
with:
"1. one
\n
- sublist
\n
"
click_on
"Preview"
# the above generates two sep
a
rate lists (not embedded) in CommonMark
# the above generates two sep
e
rate lists (not embedded) in CommonMark
expect
(
page
).
to
have_content
(
"sublist"
)
expect
(
page
).
not_to
have_xpath
(
"//ol//li//ul"
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录