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 /lib/gitlab | |
| 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 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/file_detector.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/path_regex.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/file_detector.rb b/lib/gitlab/file_detector.rb index 8f55e94975c..da62ed2fb16 100644 --- a/lib/gitlab/file_detector.rb +++ b/lib/gitlab/file_detector.rb @@ -18,7 +18,6 @@ module Gitlab # Configuration files gitignore: '.gitignore', - koding: '.koding.yml', gitlab_ci: '.gitlab-ci.yml', route_map: '.gitlab/route-map.yml', diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index 359dd2bcbc7..a78314afdb2 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -39,7 +39,6 @@ module Gitlab import invites jwt - koding login notification_settings oauth |