Merge branch 'sh-remove-koding' into 'master'

Remove Koding integration and documentation

Closes #39697

See merge request gitlab-org/gitlab-ce!22334

2 files changed, 0 insertions, 19 deletions

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index d6753e46165..0c9f69b6714 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -7,7 +7,6 @@ module ApplicationSettingsHelper
             :gravatar_enabled?,
             :password_authentication_enabled_for_web?,
             :akismet_enabled?,
-            :koding_enabled?,
             to: :'Gitlab::CurrentSettings.current_application_settings'
 
   def user_oauth_applications?
@@ -155,8 +154,6 @@ module ApplicationSettingsHelper
       :housekeeping_incremental_repack_period,
       :html_emails_enabled,
       :import_sources,
-      :koding_enabled,
-      :koding_url,
       :max_artifacts_size,
       :max_attachment_size,
       :max_pages_size,
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 0016f89db5c..d9713f9c9b0 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -388,22 +388,6 @@ module ProjectsHelper
     end
   end
 
-  def koding_project_url(project = nil, branch = nil, sha = nil)
-    if project
-      import_path = "/Home/Stacks/import"
-
-      repo = project.full_path
-      branch ||= project.default_branch
-      sha ||= project.commit.short_id
-
-      path = "#{import_path}?repo=#{repo}&branch=#{branch}&sha=#{sha}"
-
-      return URI.join(Gitlab::CurrentSettings.koding_url, path).to_s
-    end
-
-    Gitlab::CurrentSettings.koding_url
-  end
-
   def project_wiki_path_with_version(proj, page, version, is_newest)
     url_params = is_newest ? {} : { version_id: version }
     project_wiki_path(proj, page, url_params)