diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-07-31 16:29:13 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-07-31 16:29:13 +0000 |
| commit | 1b27c45753a55eaba3c935138da65e3e7ff105eb (patch) | |
| tree | 8637500714bde29bacd50b76bc977636362dbf32 /lib/api/helpers | |
| parent | 9eb87018b2659b07d5ee9c72a214987c86eca8cb (diff) | |
| parent | 1a95603510accdcdb233fa00f101da119eb1fa5c (diff) | |
| download | gitlab-ce-1b27c45753a55eaba3c935138da65e3e7ff105eb.tar.gz | |
Merge branch 'master' into '41416-making-instance-wide-data-tools-more-accessible'
# Conflicts:
# app/models/application_setting.rb
# lib/api/settings.rb
Diffstat (limited to 'lib/api/helpers')
0 files changed, 0 insertions, 0 deletions