summaryrefslogtreecommitdiff
path: root/app/controllers/notification_settings_controller.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-20 08:23:20 +0000
committerRémy Coutable <remy@rymai.me>2016-06-20 08:23:20 +0000
commit44b8b77e02423ce97f9abe80e0335f4f4c453c83 (patch)
tree07f964c88d3128ac298c1fcf0c555d8188e71f49 /app/controllers/notification_settings_controller.rb
parent98cede7ebeae9dac994b35b66be6aab14eb932b3 (diff)
parentd5b3a266e878a29e1d37194f7026c8c3d9d7aa55 (diff)
downloadgitlab-ce-44b8b77e02423ce97f9abe80e0335f4f4c453c83.tar.gz
Merge branch 'fix/import-export-prod' into 'master'
Fixed a couple of errors on import/export spotted in production Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829 A couple of tiny bugs spotted after deploying in prod See merge request !4782
Diffstat (limited to 'app/controllers/notification_settings_controller.rb')
0 files changed, 0 insertions, 0 deletions