diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-10-15 16:28:09 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-10-15 16:28:09 +0000 |
commit | 0602fcb6bf0050f71e8b8f69e0328031f9386618 (patch) | |
tree | c900c2cb8d19323c3c81d9d266ca187e1f79f885 /app/controllers | |
parent | bf47fc8b0c05bf57e18e985e2ad2569c625108b3 (diff) | |
parent | 8a934b0676b44bd601f67f8ab88fb4e3dba3134e (diff) | |
download | gitlab-ce-0602fcb6bf0050f71e8b8f69e0328031f9386618.tar.gz |
Merge branch 'sh-remove-koding' into 'master'
Remove Koding integration and documentation
Closes #39697
See merge request gitlab-org/gitlab-ce!22334
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/koding_controller.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/app/controllers/koding_controller.rb b/app/controllers/koding_controller.rb deleted file mode 100644 index 72aa9d4f17f..00000000000 --- a/app/controllers/koding_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class KodingController < ApplicationController - before_action :check_integration! - layout 'koding' - - def index - path = File.join(Rails.root, 'doc/user/project/koding.md') - @markdown = File.read(path) - end - - private - - def check_integration! - render_404 unless Gitlab::CurrentSettings.koding_enabled? - end -end |