diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-12 17:54:08 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-12 22:18:51 -0700 |
| commit | 656831e1734f037541349c3bded5514559cf20d1 (patch) | |
| tree | 6eb81e6e5c53306cae673ac3974cc402d826e926 /app/models | |
| parent | a5ecb5bbdac05c3b1a96ecb918ce6a4ceed37d75 (diff) | |
| download | gitlab-ce-656831e1734f037541349c3bded5514559cf20d1.tar.gz | |
Remove Koding integration and documentation
This integration no longer works and does not appear to be supported.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 8 | ||||
| -rw-r--r-- | app/models/repository.rb | 8 |
2 files changed, 3 insertions, 13 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 23131af1b7d..b66ec0ffab6 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -33,6 +33,8 @@ class ApplicationSetting < ActiveRecord::Base ignore_column :circuitbreaker_storage_timeout ignore_column :circuitbreaker_access_retries ignore_column :circuitbreaker_check_interval + ignore_column :koding_url + ignore_column :koding_enabled cache_markdown_field :sign_in_text cache_markdown_field :help_page_text @@ -100,10 +102,6 @@ class ApplicationSetting < ActiveRecord::Base presence: true, if: :unique_ips_limit_enabled - validates :koding_url, - presence: true, - if: :koding_enabled - validates :plantuml_url, presence: true, if: :plantuml_enabled @@ -252,8 +250,6 @@ class ApplicationSetting < ActiveRecord::Base housekeeping_gc_period: 200, housekeeping_incremental_repack_period: 10, import_sources: Settings.gitlab['import_sources'], - koding_enabled: false, - koding_url: nil, max_artifacts_size: Settings.artifacts['max_size'], max_attachment_size: Settings.gitlab['max_attachment_size'], mirror_available: true, diff --git a/app/models/repository.rb b/app/models/repository.rb index a3a3ce179fc..cfc3399a64d 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -36,7 +36,7 @@ class Repository # For example, for entry `:commit_count` there's a method called `commit_count` which # stores its data in the `commit_count` cache key. CACHED_METHODS = %i(size commit_count rendered_readme contribution_guide - changelog license_blob license_key gitignore koding_yml + changelog license_blob license_key gitignore gitlab_ci_yml branch_names tag_names branch_count tag_count avatar exists? root_ref has_visible_content? issue_template_names merge_request_template_names xcode_project?).freeze @@ -53,7 +53,6 @@ class Repository license: %i(license_blob license_key license), contributing: :contribution_guide, gitignore: :gitignore, - koding: :koding_yml, gitlab_ci: :gitlab_ci_yml, avatar: :avatar, issue_template: :issue_template_names, @@ -619,11 +618,6 @@ class Repository end cache_method :gitignore - def koding_yml - file_on_head(:koding) - end - cache_method :koding_yml - def gitlab_ci_yml file_on_head(:gitlab_ci) end |