Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e380e59e
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 搜索 >>
提交
e380e59e
编写于
3月 20, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
d2b53bd7
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
85 addition
and
0 deletion
+85
-0
app/assets/javascripts/vue_shared/components/form/title.vue
app/assets/javascripts/vue_shared/components/form/title.vue
+15
-0
app/models/prometheus_alert.rb
app/models/prometheus_alert.rb
+1
-0
changelogs/unreleased/1793-add-unlock-membership-to-ldap-column-to-groups.yml
...d/1793-add-unlock-membership-to-ldap-column-to-groups.yml
+5
-0
changelogs/unreleased/207236-snippet-edit-title.yml
changelogs/unreleased/207236-snippet-edit-title.yml
+5
-0
changelogs/unreleased/208923-enable-batch-counting-for-some-individual-queries-3.yml
...3-enable-batch-counting-for-some-individual-queries-3.yml
+5
-0
db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb
...20200304124406_add_unlock_membership_to_ldap_of_groups.rb
+19
-0
db/schema.rb
db/schema.rb
+1
-0
spec/frontend/vue_shared/components/form/__snapshots__/title_spec.js.snap
...e_shared/components/form/__snapshots__/title_spec.js.snap
+12
-0
spec/frontend/vue_shared/components/form/title_spec.js
spec/frontend/vue_shared/components/form/title_spec.js
+22
-0
未找到文件。
app/assets/javascripts/vue_shared/components/form/title.vue
0 → 100644
浏览文件 @
e380e59e
<
script
>
import
{
GlFormInput
,
GlFormGroup
}
from
'
@gitlab/ui
'
;
export
default
{
components
:
{
GlFormInput
,
GlFormGroup
,
},
};
</
script
>
<
template
>
<gl-form-group
:label=
"__('Title')"
label-for=
"title-field-edit"
>
<gl-form-input
id=
"title-field-edit"
v-bind=
"$attrs"
v-on=
"$listeners"
/>
</gl-form-group>
</
template
>
app/models/prometheus_alert.rb
浏览文件 @
e380e59e
...
...
@@ -2,6 +2,7 @@
class
PrometheusAlert
<
ApplicationRecord
include
Sortable
include
UsageStatistics
OPERATORS_MAP
=
{
lt:
"<"
,
...
...
changelogs/unreleased/1793-add-unlock-membership-to-ldap-column-to-groups.yml
0 → 100644
浏览文件 @
e380e59e
---
title
:
Add unlock_membership_to_ldap boolean to Groups
merge_request
:
26474
author
:
type
:
added
changelogs/unreleased/207236-snippet-edit-title.yml
0 → 100644
浏览文件 @
e380e59e
---
title
:
Added Edit Title shared component
merge_request
:
27582
author
:
type
:
added
changelogs/unreleased/208923-enable-batch-counting-for-some-individual-queries-3.yml
0 → 100644
浏览文件 @
e380e59e
---
title
:
Optimize projects_reporting_ci_cd_back_to_github query performance for usage data
merge_request
:
27533
author
:
type
:
performance
db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb
0 → 100644
浏览文件 @
e380e59e
# frozen_string_literal: true
class
AddUnlockMembershipToLdapOfGroups
<
ActiveRecord
::
Migration
[
5.2
]
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
def
up
with_lock_retries
do
add_column
(
:namespaces
,
:unlock_membership_to_ldap
,
:boolean
)
end
end
def
down
with_lock_retries
do
remove_column
:namespaces
,
:unlock_membership_to_ldap
end
end
end
db/schema.rb
浏览文件 @
e380e59e
...
...
@@ -2787,6 +2787,7 @@ ActiveRecord::Schema.define(version: 2020_03_19_203901) do
t
.
integer
"max_artifacts_size"
t
.
boolean
"mentions_disabled"
t
.
integer
"default_branch_protection"
,
limit:
2
t
.
boolean
"unlock_membership_to_ldap"
t
.
index
[
"created_at"
],
name:
"index_namespaces_on_created_at"
t
.
index
[
"custom_project_templates_group_id"
,
"type"
],
name:
"index_namespaces_on_custom_project_templates_group_id_and_type"
,
where:
"(custom_project_templates_group_id IS NOT NULL)"
t
.
index
[
"file_template_project_id"
],
name:
"index_namespaces_on_file_template_project_id"
...
...
spec/frontend/vue_shared/components/form/__snapshots__/title_spec.js.snap
0 → 100644
浏览文件 @
e380e59e
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Title edit field matches the snapshot 1`] = `
<gl-form-group-stub
label="Title"
label-for="title-field-edit"
>
<gl-form-input-stub
id="title-field-edit"
/>
</gl-form-group-stub>
`;
spec/frontend/vue_shared/components/form/title_spec.js
0 → 100644
浏览文件 @
e380e59e
import
TitleField
from
'
~/vue_shared/components/form/title.vue
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
describe
(
'
Title edit field
'
,
()
=>
{
let
wrapper
;
function
createComponent
()
{
wrapper
=
shallowMount
(
TitleField
);
}
beforeEach
(()
=>
{
createComponent
();
});
afterEach
(()
=>
{
wrapper
.
destroy
();
});
it
(
'
matches the snapshot
'
,
()
=>
{
expect
(
wrapper
.
element
).
toMatchSnapshot
();
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录