diff --git a/docs/development/configuration.md b/docs/development/configuration.md index 082845d7a6b4928a343ca9f464ea9fa7bd117d47..ce6819f5b8bfa557282aef1745c413a3c5317185 100644 --- a/docs/development/configuration.md +++ b/docs/development/configuration.md @@ -7,7 +7,15 @@ Configuration is supported via any or all of the below: - Configuration file - Environment - CLI -- `renovate.json`, `renovate.json5`, `.github/renovate.json`, `.github/renovate.json5`, `.renovaterc.json`, or `.renovaterc` in target repository +- Configuration file in target repository at one of the following paths: + - `renovate.json` + - `renovate.json5` + - `.github/renovate.json` + - `.github/renovate.json5` + - `.gitlab/renovate.json` + - `.gitlab/renovate.json5` + - `.renovaterc.json` + - `.renovaterc` - `renovate` field of `package.json` in target repository The above are listed in **_reverse order_** of preference. e.g. CLI values will override environment values if they conflict. diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md index 3179f14145c6a9a40a6ddf9b339dcffc28351cf8..5f9c72908540757223c0b7227a7b61a23aacb800 100644 --- a/docs/usage/configuration-options.md +++ b/docs/usage/configuration-options.md @@ -11,6 +11,8 @@ You can store your Renovate configuration file in one of the following locations - `.github/renovate.json` - `.github/renovate.json5` +- `.gitlab/renovate.json` +- `.gitlab/renovate.json5` - `.renovaterc.json` - `renovate.json` - `renovate.json5` diff --git a/lib/config/app-strings.ts b/lib/config/app-strings.ts index c74b4f53fa328549b97de4b6937f572b5bbda9d0..6f0693b1580ed75f5dac56e23b31a6dd73c4f02a 100644 --- a/lib/config/app-strings.ts +++ b/lib/config/app-strings.ts @@ -3,6 +3,8 @@ export const configFileNames = [ 'renovate.json5', '.github/renovate.json', '.github/renovate.json5', + '.gitlab/renovate.json', + '.gitlab/renovate.json5', '.renovaterc', '.renovaterc.json', 'package.json', diff --git a/test/workers/repository/init/config.spec.ts b/test/workers/repository/init/config.spec.ts index e3a273b2bb56ca8b56b95b8dbc14dbc68dac479e..cc9b1d2f97c807b1a89ceec14783dbd247fc596b 100644 --- a/test/workers/repository/init/config.spec.ts +++ b/test/workers/repository/init/config.spec.ts @@ -87,6 +87,14 @@ describe('workers/repository/init/config', () => { platform.getFile.mockResolvedValue('{}'); await mergeRenovateConfig(config); }); + it('finds .gitlab/renovate.json', async () => { + platform.getFileList.mockResolvedValue([ + 'package.json', + '.gitlab/renovate.json', + ]); + platform.getFile.mockResolvedValue('{}'); + await mergeRenovateConfig(config); + }); it('finds .renovaterc.json', async () => { platform.getFileList.mockResolvedValue([ 'package.json',