Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
27ca41ac
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,发现更多精彩内容 >>
提交
27ca41ac
编写于
2月 27, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into 'refactor-commit-show'
# Conflicts: # config/webpack.config.js
上级
9167989f
a4885b8f
变更
22
隐藏空白更改
内联
并排
Showing
22 changed file
with
49 addition
and
26 deletion
+49
-26
CONTRIBUTING.md
CONTRIBUTING.md
+3
-3
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
+2
-2
app/assets/javascripts/environments/folder/environments_folder_bundle.js
...scripts/environments/folder/environments_folder_bundle.js
+2
-2
app/assets/javascripts/pages/projects/commit/pipelines/index.js
...sets/javascripts/pages/projects/commit/pipelines/index.js
+2
-0
app/assets/javascripts/pages/projects/environments/folder/index.js
...s/javascripts/pages/projects/environments/folder/index.js
+3
-0
app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js
...ipts/pages/projects/merge_requests/creations/new/index.js
+2
-0
app/assets/javascripts/pages/projects/merge_requests/show/index.js
...s/javascripts/pages/projects/merge_requests/show/index.js
+2
-0
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+0
-8
app/models/ci/group_variable.rb
app/models/ci/group_variable.rb
+4
-1
app/models/ci/variable.rb
app/models/ci/variable.rb
+4
-1
app/validators/variable_duplicates_validator.rb
app/validators/variable_duplicates_validator.rb
+2
-0
app/views/projects/commit/_pipelines_list.haml
app/views/projects/commit/_pipelines_list.haml
+0
-1
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-1
app/views/projects/environments/folder.html.haml
app/views/projects/environments/folder.html.haml
+0
-1
changelogs/unreleased/43261-fix-prometheus-installation.yml
changelogs/unreleased/43261-fix-prometheus-installation.yml
+5
-0
changelogs/unreleased/43275-improve-variables-validation-message.yml
...unreleased/43275-improve-variables-validation-message.yml
+5
-0
changelogs/unreleased/43315-gpg-popover.yml
changelogs/unreleased/43315-gpg-popover.yml
+5
-0
config/webpack.config.js
config/webpack.config.js
+0
-4
spec/models/ci/group_variable_spec.rb
spec/models/ci/group_variable_spec.rb
+1
-1
spec/models/ci/variable_spec.rb
spec/models/ci/variable_spec.rb
+1
-1
spec/support/features/variable_list_shared_examples.rb
spec/support/features/variable_list_shared_examples.rb
+2
-0
vendor/prometheus/values.yaml
vendor/prometheus/values.yaml
+3
-0
未找到文件。
CONTRIBUTING.md
浏览文件 @
27ca41ac
...
...
@@ -397,9 +397,9 @@ For issues related to the open source stewardship of GitLab,
there is the ~"stewardship" label.
This label is to be used for issues in which the stewardship of GitLab
is a topic of discussion. For instance if GitLab Inc. is planning to
remove
features from GitLab
CE to make exclusive in GitLab EE, related issues
would be labelled with
~"stewardship".
is a topic of discussion. For instance if GitLab Inc. is planning to
add
features from GitLab
EE to GitLab CE, related issues would be labelled with
~"stewardship".
A recent example of this was the issue for
[
bringing the time tracking API to GitLab CE
][
time-tracking-issue
]
.
...
...
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
浏览文件 @
27ca41ac
...
...
@@ -15,7 +15,7 @@ const CommitPipelinesTable = Vue.extend(commitPipelinesTable);
window
.
gl
=
window
.
gl
||
{};
window
.
gl
.
CommitPipelinesTable
=
CommitPipelinesTable
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
()
=>
{
const
pipelineTableViewEl
=
document
.
querySelector
(
'
#commit-pipeline-table-view
'
);
if
(
pipelineTableViewEl
)
{
...
...
@@ -43,4 +43,4 @@ document.addEventListener('DOMContentLoaded', () => {
pipelineTableViewEl
.
appendChild
(
table
.
$el
);
}
}
}
)
;
};
app/assets/javascripts/environments/folder/environments_folder_bundle.js
浏览文件 @
27ca41ac
...
...
@@ -5,7 +5,7 @@ import Translate from '../../vue_shared/translate';
Vue
.
use
(
Translate
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
export
default
()
=>
new
Vue
({
el
:
'
#environments-folder-list-view
'
,
components
:
{
environmentsFolderApp
,
...
...
@@ -32,4 +32,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
},
});
},
})
)
;
});
app/assets/javascripts/pages/projects/commit/pipelines/index.js
浏览文件 @
27ca41ac
import
MiniPipelineGraph
from
'
~/mini_pipeline_graph_dropdown
'
;
import
initPipelines
from
'
~/commit/pipelines/pipelines_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
MiniPipelineGraph
({
container
:
'
.js-commit-pipeline-graph
'
,
}).
bindEvents
();
$
(
'
.commit-info.branches
'
).
load
(
document
.
querySelector
(
'
.js-commit-box
'
).
dataset
.
commitPath
);
initPipelines
();
});
app/assets/javascripts/pages/projects/environments/folder/index.js
0 → 100644
浏览文件 @
27ca41ac
import
initEnvironmentsFolderBundle
from
'
~/environments/folder/environments_folder_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initEnvironmentsFolderBundle
);
app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js
浏览文件 @
27ca41ac
import
Compare
from
'
~/compare
'
;
import
MergeRequest
from
'
~/merge_request
'
;
import
initPipelines
from
'
~/commit/pipelines/pipelines_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
mrNewCompareNode
=
document
.
querySelector
(
'
.js-merge-request-new-compare
'
);
...
...
@@ -14,5 +15,6 @@ document.addEventListener('DOMContentLoaded', () => {
new
MergeRequest
({
// eslint-disable-line no-new
action
:
mrNewSubmitNode
.
dataset
.
mrSubmitAction
,
});
initPipelines
();
}
});
app/assets/javascripts/pages/projects/merge_requests/show/index.js
浏览文件 @
27ca41ac
...
...
@@ -7,6 +7,7 @@ import ShortcutsIssuable from '~/shortcuts_issuable';
import
Diff
from
'
~/diff
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
import
howToMerge
from
'
~/how_to_merge
'
;
import
initPipelines
from
'
~/commit/pipelines/pipelines_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
Diff
();
// eslint-disable-line no-new
...
...
@@ -15,6 +16,7 @@ document.addEventListener('DOMContentLoaded', () => {
initIssuableSidebar
();
initNotes
();
initDiffNotes
();
initPipelines
();
const
mrShowNode
=
document
.
querySelector
(
'
.merge-request
'
);
...
...
app/assets/stylesheets/pages/commits.scss
浏览文件 @
27ca41ac
...
...
@@ -196,17 +196,9 @@
@media
(
min-width
:
$screen-sm-min
)
{
font-size
:
0
;
div
{
display
:
inline
;
}
.fa-spinner
{
font-size
:
12px
;
}
span
{
font-size
:
6px
;
}
}
.ci-status-link
{
...
...
app/models/ci/group_variable.rb
浏览文件 @
27ca41ac
...
...
@@ -6,7 +6,10 @@ module Ci
belongs_to
:group
validates
:key
,
uniqueness:
{
scope: :group_id
}
validates
:key
,
uniqueness:
{
scope: :group_id
,
message:
"(%{value}) has already been taken"
}
scope
:unprotected
,
->
{
where
(
protected:
false
)
}
end
...
...
app/models/ci/variable.rb
浏览文件 @
27ca41ac
...
...
@@ -6,7 +6,10 @@ module Ci
belongs_to
:project
validates
:key
,
uniqueness:
{
scope:
[
:project_id
,
:environment_scope
]
}
validates
:key
,
uniqueness:
{
scope:
[
:project_id
,
:environment_scope
],
message:
"(%{value}) has already been taken"
}
scope
:unprotected
,
->
{
where
(
protected:
false
)
}
end
...
...
app/validators/variable_duplicates_validator.rb
浏览文件 @
27ca41ac
...
...
@@ -5,6 +5,8 @@
# - Use `validates :xxx, uniqueness: { scope: :xxx_id }` in a child model
class
VariableDuplicatesValidator
<
ActiveModel
::
EachValidator
def
validate_each
(
record
,
attribute
,
value
)
return
if
record
.
errors
.
include?
(
:"
#{
attribute
}
.key"
)
if
options
[
:scope
]
scoped
=
value
.
group_by
do
|
variable
|
Array
(
options
[
:scope
]).
map
{
|
attr
|
variable
.
send
(
attr
)
}
# rubocop:disable GitlabSecurity/PublicSend
...
...
app/views/projects/commit/_pipelines_list.haml
浏览文件 @
27ca41ac
...
...
@@ -9,4 +9,3 @@
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'commit_pipelines'
)
app/views/projects/commits/_commit.html.haml
浏览文件 @
27ca41ac
...
...
@@ -20,7 +20,7 @@
.avatar-cell.hidden-xs
=
author_avatar
(
commit
,
size:
36
)
.commit-detail
.commit-detail
.flex-list
.commit-content
=
link_to_markdown_field
(
commit
,
:title
,
link
,
class:
"commit-row-message item-title"
)
%span
.commit-row-message.visible-xs-inline
...
...
app/views/projects/environments/folder.html.haml
浏览文件 @
27ca41ac
...
...
@@ -3,7 +3,6 @@
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
"environments_folder"
)
#environments-folder-list-view
{
data:
{
endpoint:
folder_project_environments_path
(
@project
,
@folder
,
format: :json
),
"folder-name"
=>
@folder
,
...
...
changelogs/unreleased/43261-fix-prometheus-installation.yml
0 → 100644
浏览文件 @
27ca41ac
---
title
:
Allow Prometheus application to be installed from Cluster applications
merge_request
:
17372
author
:
type
:
fixed
changelogs/unreleased/43275-improve-variables-validation-message.yml
0 → 100644
浏览文件 @
27ca41ac
---
title
:
Remove duplicated error message on duplicate variable validation
merge_request
:
17135
author
:
type
:
fixed
changelogs/unreleased/43315-gpg-popover.yml
0 → 100644
浏览文件 @
27ca41ac
---
title
:
Fixes gpg popover layout
merge_request
:
17323
author
:
type
:
fixed
config/webpack.config.js
浏览文件 @
27ca41ac
...
...
@@ -48,9 +48,7 @@ var config = {
common
:
'
./commons/index.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.js
'
,
cycle_analytics
:
'
./cycle_analytics/cycle_analytics_bundle.js
'
,
commit_pipelines
:
'
./commit/pipelines/pipelines_bundle.js
'
,
environments
:
'
./environments/environments_bundle.js
'
,
environments_folder
:
'
./environments/folder/environments_folder_bundle.js
'
,
filtered_search
:
'
./filtered_search/filtered_search_bundle.js
'
,
help
:
'
./help/help.js
'
,
merge_conflicts
:
'
./merge_conflicts/merge_conflicts_bundle.js
'
,
...
...
@@ -237,11 +235,9 @@ var config = {
name
:
'
common_vue
'
,
chunks
:
[
'
boards
'
,
'
commit_pipelines
'
,
'
cycle_analytics
'
,
'
deploy_keys
'
,
'
environments
'
,
'
environments_folder
'
,
'
filtered_search
'
,
'
groups
'
,
'
merge_conflicts
'
,
...
...
spec/models/ci/group_variable_spec.rb
浏览文件 @
27ca41ac
...
...
@@ -5,7 +5,7 @@ describe Ci::GroupVariable do
it
{
is_expected
.
to
include_module
(
HasVariable
)
}
it
{
is_expected
.
to
include_module
(
Presentable
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:key
).
scoped_to
(
:group_id
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:key
).
scoped_to
(
:group_id
)
.
with_message
(
/\(\w+\) has already been taken/
)
}
describe
'.unprotected'
do
subject
{
described_class
.
unprotected
}
...
...
spec/models/ci/variable_spec.rb
浏览文件 @
27ca41ac
...
...
@@ -6,7 +6,7 @@ describe Ci::Variable do
describe
'validations'
do
it
{
is_expected
.
to
include_module
(
HasVariable
)
}
it
{
is_expected
.
to
include_module
(
Presentable
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:key
).
scoped_to
(
:project_id
,
:environment_scope
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:key
).
scoped_to
(
:project_id
,
:environment_scope
)
.
with_message
(
/\(\w+\) has already been taken/
)
}
end
describe
'.unprotected'
do
...
...
spec/support/features/variable_list_shared_examples.rb
浏览文件 @
27ca41ac
...
...
@@ -261,6 +261,8 @@ shared_examples 'variable list' do
click_button
(
'Save variables'
)
wait_for_requests
expect
(
all
(
'.js-ci-variable-list-section .js-ci-variable-error-box ul li'
).
count
).
to
eq
(
1
)
# We check the first row because it re-sorts to alphabetical order on refresh
page
.
within
(
'.js-ci-variable-list-section'
)
do
expect
(
find
(
'.js-ci-variable-error-box'
)).
to
have_content
(
/Validation failed Variables have duplicate values \(.+\)/
)
...
...
vendor/prometheus/values.yaml
浏览文件 @
27ca41ac
...
...
@@ -10,6 +10,9 @@ nodeExporter:
pushgateway
:
enabled
:
false
rbac
:
create
:
false
server
:
image
:
tag
:
v2.1.0
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录