Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
11728b50
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 搜索 >>
提交
11728b50
编写于
11月 22, 2015
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Expose artifacts path
上级
7b70a03e
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
22 addition
and
6 deletion
+22
-6
CHANGELOG
CHANGELOG
+1
-0
app/models/application_setting.rb
app/models/application_setting.rb
+1
-1
app/uploaders/artifact_uploader.rb
app/uploaders/artifact_uploader.rb
+3
-3
config/gitlab.yml.example
config/gitlab.yml.example
+6
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+8
-1
lib/ci/api/builds.rb
lib/ci/api/builds.rb
+2
-0
lib/gitlab/current_settings.rb
lib/gitlab/current_settings.rb
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
11728b50
...
...
@@ -5,6 +5,7 @@ v 8.3.0 (unreleased)
v 8.2.0
- Improved performance of finding projects and groups in various places
- Improved performance of rendering user profile pages and Atom feeds
- Expose build artifacts path as config option
- Fix grouping of contributors by email in graph.
- Improved performance of finding issues with/without labels
- Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
...
...
app/models/application_setting.rb
浏览文件 @
11728b50
...
...
@@ -99,7 +99,7 @@ class ApplicationSetting < ActiveRecord::Base
restricted_signup_domains:
Settings
.
gitlab
[
'restricted_signup_domains'
],
import_sources:
[
'github'
,
'bitbucket'
,
'gitlab'
,
'gitorious'
,
'google_code'
,
'fogbugz'
,
'git'
],
shared_runners_enabled:
Settings
.
gitlab_ci
[
'shared_runners_enabled'
],
max_artifacts_size:
Settings
.
gitlab_ci
[
'max_artifacts
_size'
],
max_artifacts_size:
Settings
.
artifacts
[
'max
_size'
],
)
end
...
...
app/uploaders/artifact_uploader.rb
浏览文件 @
11728b50
...
...
@@ -5,15 +5,15 @@ class ArtifactUploader < CarrierWave::Uploader::Base
attr_accessor
:build
,
:field
def
self
.
artifacts_path
File
.
expand_path
(
'shared/artifacts/'
,
Rails
.
root
)
Gitlab
.
config
.
artifacts
.
path
end
def
self
.
artifacts_upload_path
File
.
expand_path
(
'shared/artifacts/tmp/uploads/'
,
Rails
.
root
)
File
.
join
(
self
.
artifacts_path
,
'tmp/uploads/'
)
end
def
self
.
artifacts_cache_path
File
.
expand_path
(
'shared/artifacts/tmp/cache/'
,
Rails
.
root
)
File
.
join
(
self
.
artifacts_path
,
'tmp/cache/'
)
end
def
initialize
(
build
,
field
)
...
...
config/gitlab.yml.example
浏览文件 @
11728b50
...
...
@@ -124,6 +124,12 @@ production: &base
# The mailbox where incoming mail will end up. Usually "inbox".
mailbox: "inbox"
## Build Artifacts
artifacts:
enabled: true
# The location where build artifacts are stored (default: shared/artifacts).
# path: shared/artifacts
## Git LFS
lfs:
enabled: true
...
...
config/initializers/1_settings.rb
浏览文件 @
11728b50
...
...
@@ -187,7 +187,6 @@ Settings.gitlab_ci['all_broken_builds'] = true if Settings.gitlab_ci['all_br
Settings
.
gitlab_ci
[
'add_pusher'
]
=
false
if
Settings
.
gitlab_ci
[
'add_pusher'
].
nil?
Settings
.
gitlab_ci
[
'url'
]
||=
Settings
.
send
(
:build_gitlab_ci_url
)
Settings
.
gitlab_ci
[
'builds_path'
]
=
File
.
expand_path
(
Settings
.
gitlab_ci
[
'builds_path'
]
||
"builds/"
,
Rails
.
root
)
Settings
.
gitlab_ci
[
'max_artifacts_size'
]
||=
100
# in megabytes
#
# Reply by email
...
...
@@ -199,6 +198,14 @@ Settings.incoming_email['ssl'] = false if Settings.incoming_email['ssl'].
Settings
.
incoming_email
[
'start_tls'
]
=
false
if
Settings
.
incoming_email
[
'start_tls'
].
nil?
Settings
.
incoming_email
[
'mailbox'
]
=
"inbox"
if
Settings
.
incoming_email
[
'mailbox'
].
nil?
#
# Build Artifacts
#
Settings
[
'artifacts'
]
||=
Settingslogic
.
new
({})
Settings
.
artifacts
[
'enabled'
]
=
true
if
Settings
.
artifacts
[
'enabled'
].
nil?
Settings
.
artifacts
[
'path'
]
=
File
.
expand_path
(
Settings
.
artifacts
[
'path'
]
||
File
.
join
(
Settings
.
shared
[
'path'
],
"artifacts"
),
Rails
.
root
)
Settings
.
artifacts
[
'max_size'
]
||=
100
# in megabytes
#
# Git LFS
#
...
...
lib/ci/api/builds.rb
浏览文件 @
11728b50
...
...
@@ -58,6 +58,7 @@ module Ci
# POST /builds/:id/artifacts/authorize
post
":id/artifacts/authorize"
do
require_gitlab_workhorse!
not_allowed!
unless
Gitlab
.
config
.
artifacts
.
enabled
build
=
Ci
::
Build
.
find_by_id
(
params
[
:id
])
not_found!
unless
build
authenticate_build_token!
(
build
)
...
...
@@ -91,6 +92,7 @@ module Ci
# POST /builds/:id/artifacts
post
":id/artifacts"
do
require_gitlab_workhorse!
not_allowed!
unless
Gitlab
.
config
.
artifacts
.
enabled
build
=
Ci
::
Build
.
find_by_id
(
params
[
:id
])
not_found!
unless
build
authenticate_build_token!
(
build
)
...
...
lib/gitlab/current_settings.rb
浏览文件 @
11728b50
...
...
@@ -25,7 +25,7 @@ module Gitlab
session_expire_delay:
Settings
.
gitlab
[
'session_expire_delay'
],
import_sources:
Settings
.
gitlab
[
'import_sources'
],
shared_runners_enabled:
Settings
.
gitlab_ci
[
'shared_runners_enabled'
],
max_artifacts_size:
Ci
::
Settings
.
gitlab_ci
[
'max_artifacts
_size'
],
max_artifacts_size:
Settings
.
artifacts
[
'max
_size'
],
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录