summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-04-11 07:45:22 +0000
committerDouwe Maan <douwe@gitlab.com>2018-04-11 07:45:22 +0000
commitfc7d76ae58cfd314867d69f2eaabb8ced31009b4 (patch)
tree1542e0c969286fe76452fd54fb272d06652c45e7 /app/models
parent863e1a7a053c8b193fb945f24eff25b96079b2c2 (diff)
parentac1b5def53b949db0245c8c8b4a2eddd5011ccc8 (diff)
downloadgitlab-ce-fc7d76ae58cfd314867d69f2eaabb8ced31009b4.tar.gz
Merge branch 'blackst0ne-rails5-fix-application-settings-controller' into 'master'
[Rails5] Fix admin/application_settings_controller See merge request gitlab-org/gitlab-ce!18275
Diffstat (limited to 'app/models')
0 files changed, 0 insertions, 0 deletions