Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
ceaef888
Commit
ceaef888
authored
6 years ago
by
Michael Kozono
Browse files
Options
Download
Email Patches
Plain Diff
WIP
parent
632c395e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
config/gitlab.yml.example
config/gitlab.yml.example
+10
-6
spec/support/webmock.rb
spec/support/webmock.rb
+1
-1
spec/unicorn/unicorn_spec.rb
spec/unicorn/unicorn_spec.rb
+1
-1
No files found.
config/gitlab.yml.example
View file @
ceaef888
...
...
@@ -745,14 +745,18 @@ test:
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
region: us-east-1
uploads:
storage_path: tmp/tests/public
object_store:
enabled: false
enabled: true
remote_directory: uploads
direct_upload: true # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
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: us-east-1
provider: AWS
aws_access_key_id: minio
aws_secret_access_key: gdk-minio
aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
region: gdk
endpoint: 'https://60c5d141.ngrok.io'
path_style: true
gitlab:
host: localhost
port: 80
...
...
This diff is collapsed.
Click to expand it.
spec/support/webmock.rb
View file @
ceaef888
require
'webmock'
require
'webmock/rspec'
WebMock
.
disable_net_connect!
(
allow_localhost:
true
)
WebMock
.
disable_net_connect!
(
allow_localhost:
true
,
allow:
%r{https://
\w
+.ngrok.io/}
)
This diff is collapsed.
Click to expand it.
spec/unicorn/unicorn_spec.rb
View file @
ceaef888
...
...
@@ -77,7 +77,7 @@ describe 'Unicorn' do
end
after
(
:all
)
do
WebMock
.
disable_net_connect!
(
allow_localhost:
true
)
WebMock
.
disable_net_connect!
(
allow_localhost:
true
,
allow:
%r{https://
\w
+.ngrok.io/}
)
Process
.
kill
(
'TERM'
,
@unicorn_master_pid
)
end
...
...
This diff is collapsed.
Click to expand it.
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