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
8a0ffcfb
Commit
8a0ffcfb
authored
Apr 05, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename environment variable EE to IS_GITLAB_EE
(cherry picked from commit
64e9cf00
)
parent
08699259
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
config/helpers/is_ee_env.js
config/helpers/is_ee_env.js
+2
-2
config/webpack.config.js
config/webpack.config.js
+1
-1
spec/javascripts/test_bundle.js
spec/javascripts/test_bundle.js
+3
-3
No files found.
config/helpers/is_ee_env.js
View file @
8a0ffcfb
...
...
@@ -4,6 +4,6 @@ const path = require('path');
const
ROOT_PATH
=
path
.
resolve
(
__dirname
,
'
../..
'
);
module
.
exports
=
process
.
env
.
EE
!==
undefined
?
JSON
.
parse
(
process
.
env
.
EE
)
process
.
env
.
IS_GITLAB_
EE
!==
undefined
?
JSON
.
parse
(
process
.
env
.
IS_GITLAB_
EE
)
:
fs
.
existsSync
(
path
.
join
(
ROOT_PATH
,
'
ee
'
));
config/webpack.config.js
View file @
8a0ffcfb
...
...
@@ -322,7 +322,7 @@ module.exports = {
}),
new
webpack
.
DefinePlugin
({
'
process.env.EE
'
:
JSON
.
stringify
(
IS_EE
),
'
process.env.
IS_GITLAB_
EE
'
:
JSON
.
stringify
(
IS_EE
),
}),
].
filter
(
Boolean
),
...
...
spec/javascripts/test_bundle.js
View file @
8a0ffcfb
...
...
@@ -69,7 +69,7 @@ window.gl = window.gl || {};
window
.
gl
.
TEST_HOST
=
TEST_HOST
;
window
.
gon
=
window
.
gon
||
{};
window
.
gon
.
test_env
=
true
;
window
.
gon
.
ee
=
process
.
env
.
EE
;
window
.
gon
.
ee
=
process
.
env
.
IS_GITLAB_
EE
;
gon
.
relative_url_root
=
''
;
let
hasUnhandledPromiseRejections
=
false
;
...
...
@@ -124,7 +124,7 @@ const axiosDefaultAdapter = getDefaultAdapter();
// render all of our tests
const
testContexts
=
[
require
.
context
(
'
spec
'
,
true
,
/_spec$/
)];
if
(
process
.
env
.
EE
)
{
if
(
process
.
env
.
IS_GITLAB_
EE
)
{
testContexts
.
push
(
require
.
context
(
'
ee_spec
'
,
true
,
/_spec$/
));
}
...
...
@@ -213,7 +213,7 @@ if (process.env.BABEL_ENV === 'coverage') {
describe
(
'
Uncovered files
'
,
function
()
{
const
sourceFilesContexts
=
[
require
.
context
(
'
~
'
,
true
,
/
\.(
js|vue
)
$/
)];
if
(
process
.
env
.
EE
)
{
if
(
process
.
env
.
IS_GITLAB_
EE
)
{
sourceFilesContexts
.
push
(
require
.
context
(
'
ee
'
,
true
,
/
\.(
js|vue
)
$/
));
}
...
...
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