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
46f4b53a
Commit
46f4b53a
authored
Aug 26, 2016
by
Ruben Davila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ELASTIC_HOST env var in order to use a friendly value for URI parser.
parent
6e2536cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
spec/support/webmock.rb
spec/support/webmock.rb
+1
-1
No files found.
.gitlab-ci.yml
View file @
46f4b53a
...
...
@@ -10,7 +10,7 @@ variables:
MYSQL_ALLOW_EMPTY_PASSWORD
:
"
1"
# retry tests only in CI environment
RSPEC_RETRY_RETRY_COUNT
:
"
3"
ELASTIC_HOST
:
"
registry.gitlab.com
__gitlab-org__
test-elastic-image"
ELASTIC_HOST
:
"
registry.gitlab.com
-gitlab-org-
test-elastic-image"
RAILS_ENV
:
"
test"
SIMPLECOV
:
"
true"
USE_DB
:
"
true"
...
...
spec/support/webmock.rb
View file @
46f4b53a
...
...
@@ -2,4 +2,4 @@ require 'webmock'
require
'webmock/rspec'
WebMock
.
disable_net_connect!
(
allow_localhost:
true
,
allow:
'elasticsearch'
)
WebMock
.
disable_net_connect!
(
allow_localhost:
true
,
allow:
'registry.gitlab.com
__gitlab-org__
test-elastic-image'
)
WebMock
.
disable_net_connect!
(
allow_localhost:
true
,
allow:
'registry.gitlab.com
-gitlab-org-
test-elastic-image'
)
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