diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-04-05 18:51:50 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-04-05 18:51:50 +0000 |
| commit | 361c7ca69787e75b3ad2c776245452bd49e4a13c (patch) | |
| tree | 22bbed6a0c50cffc6cdc26f314abf9331d7d9c16 /config | |
| parent | 097b63fcb3bc45a383adedc725729fe9b5dc75a9 (diff) | |
| parent | 64e9cf00a7d889913ae7327695394cac29643f0b (diff) | |
| download | gitlab-ce-361c7ca69787e75b3ad2c776245452bd49e4a13c.tar.gz | |
Merge branch 'winh-ee-environment-variable' into 'master'
Rename environment variable EE to IS_GITLAB_EE
Closes #60080
See merge request gitlab-org/gitlab-ce!27044
Diffstat (limited to 'config')
| -rw-r--r-- | config/helpers/is_ee_env.js | 4 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/helpers/is_ee_env.js b/config/helpers/is_ee_env.js index 1fdbca591c0..3fe9bb891eb 100644 --- a/config/helpers/is_ee_env.js +++ b/config/helpers/is_ee_env.js @@ -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')); diff --git a/config/webpack.config.js b/config/webpack.config.js index 9a37856a99e..19b48845305 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -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), |