Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6b8d88d2
Commit
6b8d88d2
authored
Aug 17, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use gitlab.yml.example instead of settings logic stubbing
parent
167296f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
config/gitlab.yml.example
config/gitlab.yml.example
+12
-0
spec/support/stub_artifacts.rb
spec/support/stub_artifacts.rb
+1
-11
No files found.
config/gitlab.yml.example
View file @
6b8d88d2
...
...
@@ -729,6 +729,18 @@ test:
enabled: true
lfs:
enabled: false
artifacts:
enabled: true
# The location where build artifacts are stored (default: shared/artifacts).
# path: shared/artifacts
object_store:
enabled: false
remote_directory: artifacts # The bucket name
connection:
provider: AWS # Only AWS supported at the moment
aws_access_key_id: AWS_ACCESS_KEY_ID
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
region: eu-central-1
gitlab:
host: localhost
port: 80
...
...
spec/support/stub_artifacts.rb
View file @
6b8d88d2
module
StubConfiguration
def
stub_artifacts_object_storage
(
enabled:
true
)
Fog
.
mock!
object_store
=
Settingslogic
.
new
(
'enabled'
=>
enabled
,
'remote_directory'
=>
'artifacts'
,
'connection'
=>
Settingslogic
.
new
(
'provider'
=>
'AWS'
,
'aws_access_key_id'
=>
'AWS_ACCESS_KEY_ID'
,
'aws_secret_access_key'
=>
'AWS_SECRET_ACCESS_KEY'
,
'region'
=>
'eu-central-1'
)
)
allow
(
Gitlab
.
config
.
artifacts
).
to
receive
(
:object_store
)
{
object_store
}
allow
(
Gitlab
.
config
.
artifacts
.
object_store
).
to
receive
(
:enabled
)
{
enabled
}
allow_any_instance_of
(
ArtifactUploader
).
to
receive
(
:verify_license!
)
{
true
}
return
unless
enabled
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment