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 | |
| 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
78 files changed, 27 insertions, 962 deletions
diff --git a/app/assets/images/koding-logo.svg b/app/assets/images/koding-logo.svg deleted file mode 100644 index ad89d684d94..00000000000 --- a/app/assets/images/koding-logo.svg +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 14"> - <g fill="#d6d7d9"> - <path d="M8.7 0L5.3.3l3.2 6.8-3.2 6.6 3.5.3L12 6.9z"/> - <ellipse cx="1.7" cy="11.1" rx="1.7" ry="1.7"/> - <ellipse cx="1.7" cy="5.6" rx="1.7" ry="1.7"/> - </g> -</svg>
\ No newline at end of file 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 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) 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 diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb index d2434d96fd7..79cd3606aec 100644 --- a/app/presenters/project_presenter.rb +++ b/app/presenters/project_presenter.rb @@ -36,8 +36,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated contribution_guide_anchor_data, autodevops_anchor_data(show_auto_devops_callout: show_auto_devops_callout), kubernetes_cluster_anchor_data, - gitlab_ci_anchor_data, - koding_anchor_data + gitlab_ci_anchor_data ].compact.reject { |item| item.enabled } end @@ -125,43 +124,6 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated add_special_file_path(file_name: 'README.md') end - def add_koding_stack_path - project_new_blob_path( - project, - default_branch || 'master', - file_name: '.koding.yml', - commit_message: "Add Koding stack script", - content: <<-CONTENT.strip_heredoc - provider: - aws: - access_key: '${var.aws_access_key}' - secret_key: '${var.aws_secret_key}' - resource: - aws_instance: - #{project.path}-vm: - instance_type: t2.nano - user_data: |- - - # Created by GitLab UI for :> - - echo _KD_NOTIFY_@Installing Base packages...@ - - apt-get update -y - apt-get install git -y - - echo _KD_NOTIFY_@Cloning #{project.name}...@ - - export KODING_USER=${var.koding_user_username} - export REPO_URL=#{root_url}${var.koding_queryString_repo}.git - export BRANCH=${var.koding_queryString_branch} - - sudo -i -u $KODING_USER git clone $REPO_URL -b $BRANCH - - echo _KD_NOTIFY_@#{project.name} cloned.@ - CONTENT - ) - end - def license_short_name license = repository.license license&.nickname || license&.name || 'LICENSE' @@ -310,14 +272,6 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated end end - def koding_anchor_data - if current_user && can_current_user_push_code? && koding_enabled? && repository.koding_yml.blank? - AnchorData.new(false, - _('Set up Koding'), - add_koding_stack_path) - end - end - def tags_to_show project.tag_list.take(MAX_TAGS_TO_SHOW) # rubocop: disable CodeReuse/ActiveRecord end @@ -363,8 +317,4 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated branch_name: branch_name ) end - - def koding_enabled? - Gitlab::CurrentSettings.koding_enabled? - end end diff --git a/app/views/admin/application_settings/_koding.html.haml b/app/views/admin/application_settings/_koding.html.haml deleted file mode 100644 index 8b635b08abd..00000000000 --- a/app/views/admin/application_settings/_koding.html.haml +++ /dev/null @@ -1,22 +0,0 @@ -= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-koding-settings'), html: { class: 'fieldset-form' } do |f| - = form_errors(@application_setting) - - %fieldset - .form-group - .form-check - = f.check_box :koding_enabled, class: 'form-check-input' - = f.label :koding_enabled, class: 'form-check-label' do - Enable Koding - .form-text.text-muted - Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again. - .form-group - = f.label :koding_url, 'Koding URL', class: 'label-bold' - = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090' - .form-text.text-muted - Koding has integration enabled out of the box for the - %strong gitlab - team, and you need to provide that team's URL here. Learn more in the - = succeed "." do - = link_to "Koding administration documentation", help_page_path("administration/integration/koding") - - = f.submit 'Save changes', class: "btn btn-success" diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index 279db189a24..65e4723afe6 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -68,18 +68,6 @@ .settings-content = render 'terms' -- if koding_enabled? - %section.settings.as-koding.no-animate#js-koding-settings{ class: ('expanded' if expanded_by_default?) } - .settings-header - %h4 - = _('Koding') - %button.btn.btn-default.js-settings-toggle{ type: 'button' } - = expanded_by_default? ? _('Collapse') : _('Expand') - %p - = _('Online IDE integration settings.') - .settings-content - = render 'koding' - = render_if_exists 'admin/application_settings/external_authorization_service_form', expanded: expanded_by_default? %section.settings.as-terminal.no-animate#js-terminal-settings{ class: ('expanded' if expanded_by_default?) } diff --git a/app/views/koding/index.html.haml b/app/views/koding/index.html.haml deleted file mode 100644 index bb7f9ba7ae4..00000000000 --- a/app/views/koding/index.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -.row-content-block.second-block.center - %p - = icon('circle', class: 'cgreen') - Integration is active for - = link_to koding_project_url, target: '_blank', rel: 'noopener noreferrer' do - #{Gitlab::CurrentSettings.koding_url} diff --git a/app/views/layouts/koding.html.haml b/app/views/layouts/koding.html.haml deleted file mode 100644 index 45ccd38f687..00000000000 --- a/app/views/layouts/koding.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -- page_title _("Koding") -- page_description _("Koding Dashboard") -- header_title _("Koding"), koding_path - -= render template: "layouts/application" diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index ced6a2a0399..61ed951dea9 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -76,8 +76,6 @@ = render 'projects/buttons/download', project: @project, ref: @ref .d-none.d-sm-inline-flex = render 'projects/buttons/dropdown' - .d-none.d-sm-inline-flex - = render 'projects/buttons/koding' .d-none.d-sm-inline-flex = render 'shared/notifications/button', notification_setting: @notification_setting diff --git a/app/views/projects/buttons/_koding.html.haml b/app/views/projects/buttons/_koding.html.haml deleted file mode 100644 index e665ca61da8..00000000000 --- a/app/views/projects/buttons/_koding.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -- if koding_enabled? && current_user && @repository.koding_yml && @project.can_current_user_push_code? - = link_to koding_project_url(@project), class: 'btn project-action-button inline', target: '_blank', rel: 'noopener noreferrer' do - _('Run in IDE (Koding)') diff --git a/changelogs/unreleased/sh-remove-koding.yml b/changelogs/unreleased/sh-remove-koding.yml new file mode 100644 index 00000000000..2c4e8c76a61 --- /dev/null +++ b/changelogs/unreleased/sh-remove-koding.yml @@ -0,0 +1,5 @@ +--- +title: Remove Koding integration and documentation +merge_request: 22334 +author: +type: removed diff --git a/config/routes.rb b/config/routes.rb index 5c093aa5626..c081ca9672a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -81,9 +81,6 @@ Rails.application.routes.draw do draw :instance_statistics end - # Koding route - get 'koding' => 'koding#index' - draw :api draw :sidekiq draw :help diff --git a/db/post_migrate/20181013005024_remove_koding_from_application_settings.rb b/db/post_migrate/20181013005024_remove_koding_from_application_settings.rb new file mode 100644 index 00000000000..938a32e4e98 --- /dev/null +++ b/db/post_migrate/20181013005024_remove_koding_from_application_settings.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class RemoveKodingFromApplicationSettings < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + remove_column :application_settings, :koding_enabled + remove_column :application_settings, :koding_url + end + + def down + add_column :application_settings, :koding_enabled, :boolean # rubocop:disable Migration/SaferBooleanColumn + add_column :application_settings, :koding_url, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 5b44bbb2756..3f3bec0ce04 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20181008200441) do +ActiveRecord::Schema.define(version: 20181013005024) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -104,8 +104,6 @@ ActiveRecord::Schema.define(version: 20181008200441) do t.boolean "domain_blacklist_enabled", default: false t.text "domain_blacklist" t.boolean "usage_ping_enabled", default: true, null: false - t.boolean "koding_enabled" - t.string "koding_url" t.text "sign_in_text_html" t.text "help_page_text_html" t.text "shared_runners_text_html" diff --git a/doc/administration/integration/koding.md b/doc/administration/integration/koding.md deleted file mode 100644 index def0add0061..00000000000 --- a/doc/administration/integration/koding.md +++ /dev/null @@ -1,246 +0,0 @@ -# Koding & GitLab - -> **Notes:** -> - **As of GitLab 10.0, the Koding integration is deprecated and will be removed -> in a future version. The option to configure it is removed from GitLab's admin -> area.** -> - [Introduced][ce-5909] in GitLab 8.11. - -This document will guide you through installing and configuring Koding with -GitLab. - -First of all, to be able to use Koding and GitLab together you will need public -access to your server. This allows you to use single sign-on from GitLab to -Koding and using vms from cloud providers like AWS. Koding has a registry for -VMs, called Kontrol and it runs on the same server as Koding itself, VMs from -cloud providers register themselves to Kontrol via the agent that we put into -provisioned VMs. This agent is called Klient and it provides Koding to access -and manage the target machine. - -Kontrol and Klient are based on another technology called -[Kite](https://github.com/koding/kite), that we have written at Koding. Which is a -microservice framework that allows you to develop microservices easily. - -## Requirements - -### Hardware - -Minimum requirements are; - - - 2 cores CPU - - 3G RAM - - 10G Storage - -If you plan to use AWS to install Koding it is recommended that you use at -least a `c3.xlarge` instance. - -### Software - - - [Git](https://git-scm.com) - - [Docker](https://www.docker.com) - - [docker-compose](https://www.docker.com/products/docker-compose) - -Koding can run on most of the UNIX based operating systems, since it's shipped -as containerized with Docker support, it can work on any operating system that -supports Docker. - -Required services are: - -- **PostgreSQL** - Kontrol and Service DB provider -- **MongoDB** - Main DB provider the application -- **Redis** - In memory DB used by both application and services -- **RabbitMQ** - Message Queue for both application and services - -which are also provided as a Docker container by Koding. - - -## Getting Started with Development Versions - - -### Koding - -You can run `docker-compose` environment for developing koding by -executing commands in the following snippet. - -```bash -git clone https://github.com/koding/koding.git -cd koding -docker-compose -f docker-compose-init.yml run init -docker-compose up -``` - -This should start koding on `localhost:8090`. - -By default there is no team exists in Koding DB. You'll need to create a team -called `gitlab` which is the default team name for GitLab integration in the -configuration. To make things in order it's recommended to create the `gitlab` -team first thing after setting up Koding. - - -### GitLab - -To install GitLab to your environment for development purposes it's recommended -to use GitLab Development Kit which you can get it from -[here](https://gitlab.com/gitlab-org/gitlab-development-kit). - -After all those steps, gitlab should be running on `localhost:3000` - - -## Integration - -Integration includes following components; - - - Single Sign On with OAuth from GitLab to Koding - - System Hook integration for handling GitLab events on Koding - (`project_created`, `user_joined` etc.) - - Service endpoints for importing/executing stacks from GitLab to Koding - (`Run/Try on IDE (Koding)` buttons on GitLab Projects, Issues, MRs) - -As it's pointed out before, you will need public access to this machine that -you've installed Koding and GitLab on. Better to use a domain but a static IP -is also fine. - -For IP based installation you can use [nip.io](https://nip.io) service which is -free and provides DNS resolution to IP based requests like following; - - - 127.0.0.1.nip.io -> resolves to 127.0.0.1 - - foo.bar.baz.127.0.0.1.nip.io -> resolves to 127.0.0.1 - - and so on... - -As Koding needs subdomains for team names; `foo.127.0.0.1.nip.io` requests for -a running koding instance on `127.0.0.1` server will be handled as `foo` team -requests. - - -### GitLab Side - -You need to enable Koding integration from Settings under Admin Area. To do -that login with an Admin account and do followings; - -- open [http://127.0.0.1:3000/admin/application_settings](http://127.0.0.1:3000/admin/application_settings) -- scroll to bottom of the page until Koding section -- check `Enable Koding` checkbox -- provide GitLab team page for running Koding instance as `Koding URL`* - * For `Koding URL` you need to provide the gitlab integration enabled team on -your Koding installation. Team called `gitlab` has integration on Koding out -of the box, so if you didn't change anything your team on Koding should be -`gitlab`. - -So, if your Koding is running on `http://1.2.3.4.nip.io:8090` your URL needs -to be `http://gitlab.1.2.3.4.nip.io:8090`. You need to provide the same host -with your Koding installation here. - - -#### Registering Koding for OAuth integration - -We need `Application ID` and `Secret` to enable login to Koding via GitLab -feature and to do that you need to register running Koding as a new application -to your running GitLab application. Follow -[these](http://docs.gitlab.com/ce/integration/oauth_provider.html) steps to -enable this integration. - -Redirect URI should be `http://gitlab.127.0.0.1:8090/-/oauth/gitlab/callback` -which again you need to _replace `127.0.0.1` with your instance public IP._ - -Take a copy of `Application ID` and `Secret` that is generated by the GitLab -application, we will need those on _Koding Part_ of this guide. - - -#### Registering system hooks to Koding (optional) - -Koding can take actions based on the events generated by GitLab application. -This feature is still in progress and only following events are processed by -Koding at the moment; - - - user_create - - user_destroy - -All system events are handled but not implemented on Koding side. - -To enable this feature you need to provide a `URL` and a `Secret Token` to your -GitLab application. Open your admin area on your GitLab app from -[http://127.0.0.1:3000/admin/hooks](http://127.0.0.1:3000/admin/hooks) -and provide `URL` as `http://gitlab.127.0.0.1:8090/-/api/gitlab` which is the -endpoint to handle GitLab events on Koding side. Provide a `Secret Token` and -keep a copy of it, we will need it on _Koding Part_ of this guide. - -_(replace `127.0.0.1` with your instance public IP)_ - - -### Koding Part - -If you followed the steps in GitLab part we should have followings to enable -Koding part integrations; - - - `Application ID` and `Secret` for OAuth integration - - `Secret Token` for system hook integration - - Public address of running GitLab instance - - -#### Start Koding with GitLab URL - -Now we need to configure Koding with all this information to get things ready. -If it's already running please stop koding first. - -##### From command-line - -Replace followings with the ones you got from GitLab part of this guide; - -```bash -cd koding -docker-compose run \ - --service-ports backend \ - /opt/koding/scripts/bootstrap-container build \ - --host=**YOUR_IP**.nip.io \ - --gitlabHost=**GITLAB_IP** \ - --gitlabPort=**GITLAB_PORT** \ - --gitlabToken=**SECRET_TOKEN** \ - --gitlabAppId=**APPLICATION_ID** \ - --gitlabAppSecret=**SECRET** -``` - -##### By updating configuration - -Alternatively you can update `gitlab` section on -`config/credentials.default.coffee` like following; - -``` -gitlab = - host: '**GITLAB_IP**' - port: '**GITLAB_PORT**' - applicationId: '**APPLICATION_ID**' - applicationSecret: '**SECRET**' - team: 'gitlab' - redirectUri: '' - systemHookToken: '**SECRET_TOKEN**' - hooksEnabled: yes -``` - -and start by only providing the `host`; - -```bash -cd koding -docker-compose run \ - --service-ports backend \ - /opt/koding/scripts/bootstrap-container build \ - --host=**YOUR_IP**.nip.io \ -``` - -#### Enable Single Sign On - -Once you restarted your Koding and logged in with your username and password -you need to activate oauth authentication for your user. To do that - - - Navigate to Dashboard on Koding from; - `http://gitlab.**YOUR_IP**.nip.io:8090/Home/my-account` - - Scroll down to Integrations section - - Click on toggle to turn On integration in GitLab integration section - -This will redirect you to your GitLab instance and will ask your permission ( -if you are not logged in to GitLab at this point you will be redirected after -login) once you accept you will be redirected to your Koding instance. - -From now on you can login by using `SIGN IN WITH GITLAB` button on your Login -screen in your Koding instance. - -[ce-5909]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909 diff --git a/doc/api/settings.md b/doc/api/settings.md index 4482030888d..826820c4693 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -45,8 +45,6 @@ Example response: "sign_in_text" : null, "container_registry_token_expire_delay": 5, "repository_storages": ["default"], - "koding_enabled": false, - "koding_url": null, "plantuml_enabled": false, "plantuml_url": null, "terminal_max_session_time": 0, @@ -103,8 +101,6 @@ Example response: "after_sign_out_path": "", "container_registry_token_expire_delay": 5, "repository_storages": ["default"], - "koding_enabled": false, - "koding_url": null, "plantuml_enabled": false, "plantuml_url": null, "terminal_max_session_time": 0, @@ -175,8 +171,6 @@ are listed in the descriptions of the relevant settings. | `html_emails_enabled` | boolean | no | Enable HTML emails. | | `instance_statistics_visibility_private` | boolean | no | When set to `true` Instance statistics will only be available to admins. | | `import_sources` | array of strings | no | Sources to allow project import from, possible values: `github`, `bitbucket`, `gitlab`, `google_code`, `fogbugz`, `git`, and `gitlab_project`. | -| `koding_enabled` | boolean | no | (If enabled, requires: `koding_url`) Enable Koding integration. Default is `false`. | -| `koding_url` | string | required by: `koding_enabled` | The Koding instance URL for integration. | | `max_artifacts_size` | integer | no | Maximum artifacts size in MB | | `max_attachment_size` | integer | no | Limit attachment size in MB | | `max_pages_size` | integer | no | Maximum size of pages repositories in MB | diff --git a/doc/user/project/img/koding_build-in-progress.png b/doc/user/project/img/koding_build-in-progress.png Binary files differdeleted file mode 100644 index 118b97c07e1..00000000000 --- a/doc/user/project/img/koding_build-in-progress.png +++ /dev/null diff --git a/doc/user/project/img/koding_build-logs.png b/doc/user/project/img/koding_build-logs.png Binary files differdeleted file mode 100644 index b30c8375b20..00000000000 --- a/doc/user/project/img/koding_build-logs.png +++ /dev/null diff --git a/doc/user/project/img/koding_build-success.png b/doc/user/project/img/koding_build-success.png Binary files differdeleted file mode 100644 index 0f3b954abf5..00000000000 --- a/doc/user/project/img/koding_build-success.png +++ /dev/null diff --git a/doc/user/project/img/koding_commit-koding.yml.png b/doc/user/project/img/koding_commit-koding.yml.png Binary files differdeleted file mode 100644 index d921c73dc73..00000000000 --- a/doc/user/project/img/koding_commit-koding.yml.png +++ /dev/null diff --git a/doc/user/project/img/koding_different-stack-on-mr-try.png b/doc/user/project/img/koding_different-stack-on-mr-try.png Binary files differdeleted file mode 100644 index 10c7c51d2e6..00000000000 --- a/doc/user/project/img/koding_different-stack-on-mr-try.png +++ /dev/null diff --git a/doc/user/project/img/koding_edit-on-ide.png b/doc/user/project/img/koding_edit-on-ide.png Binary files differdeleted file mode 100644 index 25ca7694fe0..00000000000 --- a/doc/user/project/img/koding_edit-on-ide.png +++ /dev/null diff --git a/doc/user/project/img/koding_enable-koding.png b/doc/user/project/img/koding_enable-koding.png Binary files differdeleted file mode 100644 index 7e6c1735df2..00000000000 --- a/doc/user/project/img/koding_enable-koding.png +++ /dev/null diff --git a/doc/user/project/img/koding_landing.png b/doc/user/project/img/koding_landing.png Binary files differdeleted file mode 100644 index ac880376e09..00000000000 --- a/doc/user/project/img/koding_landing.png +++ /dev/null diff --git a/doc/user/project/img/koding_open-gitlab-from-koding.png b/doc/user/project/img/koding_open-gitlab-from-koding.png Binary files differdeleted file mode 100644 index 4235a72b36f..00000000000 --- a/doc/user/project/img/koding_open-gitlab-from-koding.png +++ /dev/null diff --git a/doc/user/project/img/koding_run-in-ide.png b/doc/user/project/img/koding_run-in-ide.png Binary files differdeleted file mode 100644 index fb5825a4010..00000000000 --- a/doc/user/project/img/koding_run-in-ide.png +++ /dev/null diff --git a/doc/user/project/img/koding_run-mr-in-ide.png b/doc/user/project/img/koding_run-mr-in-ide.png Binary files differdeleted file mode 100644 index cb1112c4034..00000000000 --- a/doc/user/project/img/koding_run-mr-in-ide.png +++ /dev/null diff --git a/doc/user/project/img/koding_set-up-ide.png b/doc/user/project/img/koding_set-up-ide.png Binary files differdeleted file mode 100644 index 033d41729a2..00000000000 --- a/doc/user/project/img/koding_set-up-ide.png +++ /dev/null diff --git a/doc/user/project/img/koding_stack-import.png b/doc/user/project/img/koding_stack-import.png Binary files differdeleted file mode 100644 index 483bfad7d6a..00000000000 --- a/doc/user/project/img/koding_stack-import.png +++ /dev/null diff --git a/doc/user/project/img/koding_start-build.png b/doc/user/project/img/koding_start-build.png Binary files differdeleted file mode 100644 index c09a6d669f0..00000000000 --- a/doc/user/project/img/koding_start-build.png +++ /dev/null diff --git a/doc/user/project/koding.md b/doc/user/project/koding.md deleted file mode 100644 index 2c886d7916a..00000000000 --- a/doc/user/project/koding.md +++ /dev/null @@ -1,131 +0,0 @@ -# Koding integration - -> **Notes:** -> - **As of GitLab 10.0, the Koding integration is deprecated and will be removed -> in a future version.** -> - [Introduced][ce-5909] in GitLab 8.11. - -This document will guide you through using Koding integration on GitLab in -detail. For configuring and installing please follow the -[administrator guide](../../administration/integration/koding.md). - -You can use Koding integration to run and develop your projects on GitLab. This -will allow you and the users to test your project without leaving the browser. -Koding handles projects as stacks which are basic recipes to define your -environment for your project. With this integration you can automatically -create a proper stack template for your projects. Currently auto-generated -stack templates are designed to work with AWS which requires a valid AWS -credential to be able to use these stacks. You can find more information about -stacks and the other providers that you can use on Koding following the -[Koding documentation][koding-docs]. - -## Enable Integration - -You can enable Koding integration by providing the running Koding instance URL -in Application Settings under **Admin area > Settings** (`/admin/application_settings`). - - - -Once enabled you will see `Koding` link on your sidebar which leads you to -Koding Landing page. - - - -You can navigate to running Koding instance from here. For more information and -details about configuring the integration, please follow the -[administrator guide](../../administration/integration/koding.md). - -## Set up Koding on Projects - -Once it's enabled, you will see some integration buttons on Project pages, -Merge Requests etc. To get started working on a specific project you first need -to create a `.koding.yml` file under your project root. You can easily do that -by using `Set Up Koding` button which will be visible on every project's -landing page; - - - -Once you click this will open a New File page on GitLab with auto-generated -`.koding.yml` content based on your server and repository configuration. - - - - -## Run a project on Koding - -If there is `.koding.yml` exists in your project root, you will see -`Run in IDE (Koding)` button in your project landing page. You can initiate the -process from here. - - - -This will open Koding defined in the settings in a new window and will start -importing the project's stack file. - - - -You should see the details of your repository imported into your Koding -instance. Once it's completed it will lead you to the Stack Editor and from -there you can start using your new stack integrated with your project on your -GitLab instance. For details about what's next you can follow -[this guide](https://www.koding.com/docs/creating-an-aws-stack) from step 8. - -Once stack initialized you will see the `README.md` content from your project -in `Stack Build` wizard, this wizard will let you build the stack and import -your project into it. **Once it's completed it will automatically open the -related vm instead of importing from scratch**. - - - -This will take time depending on the required environment. - - - -It usually takes ~4 min. to make it ready with a `t2.nano` instance on given -AWS region. (`t2.nano` is default vm type on auto-generated stack template -which can be manually changed). - - - -You can check out the `Build Logs` from this success modal as well. - - - -You can now `Start Coding`! - - - -## Try a Merge Request on IDE - -It's also possible to try a change on IDE before merging it. This flow only -enabled if the target project has `.koding.yml` in it's target branch. You -should see the alternative version of `Run in IDE (Koding)` button in merge -request pages as well; - - - -This will again take you to Koding with proper arguments passed, which will -allow Koding to modify the stack template provided by target branch. You can -see the difference; - - - -The flow for the branch stack is also same with the regular project flow. - -## Open GitLab from Koding - -Since stacks generated with import flow defined in previous steps, they have -information about the repository they are belonging to. By using this -information you can access to related GitLab page from stacks on your sidebar -on Koding. - - - -## Other links - -- [YouTube video on GitLab + Koding workflow][youtube] -- [Koding documentation][koding-docs] - -[ce-5909]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5909 -[youtube]: https://youtu.be/3wei5yv_Ye8 -[koding-docs]: https://www.koding.com/docs diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md index 52610378ad5..45c306f5988 100644 --- a/doc/user/reserved_names.md +++ b/doc/user/reserved_names.md @@ -68,7 +68,6 @@ Currently the following names are reserved as top level groups: - import - invites - jwt -- koding - notification_settings - oauth - profile diff --git a/lib/api/settings.rb b/lib/api/settings.rb index edbd134822c..f53ba0ab761 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -66,10 +66,6 @@ module API optional :html_emails_enabled, type: Boolean, desc: 'By default GitLab sends emails in HTML and plain text formats so mail clients can choose what format to use. Disable this option if you only want to send emails in plain text format.' optional :import_sources, type: Array[String], values: %w[github bitbucket gitlab google_code fogbugz git gitlab_project manifest], desc: 'Enabled sources for code import during project creation. OmniAuth must be configured for GitHub, Bitbucket, and GitLab.com' - optional :koding_enabled, type: Boolean, desc: 'Enable Koding' - given koding_enabled: ->(val) { val } do - requires :koding_url, type: String, desc: 'The Koding team URL' - end optional :max_artifacts_size, type: Integer, desc: "Set the maximum file size for each job's artifacts" optional :max_attachment_size, type: Integer, desc: 'Maximum attachment size in MB' optional :max_pages_size, type: Integer, desc: 'Maximum size of pages in MB' 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 diff --git a/locale/ar_SA/gitlab.po b/locale/ar_SA/gitlab.po index d196fac6c60..dd3c767dbe7 100644 --- a/locale/ar_SA/gitlab.po +++ b/locale/ar_SA/gitlab.po @@ -4410,12 +4410,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6942,9 +6936,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/bg/gitlab.po b/locale/bg/gitlab.po index 0d5026c0f4a..95d08a6a4ec 100644 --- a/locale/bg/gitlab.po +++ b/locale/bg/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "Настройка на „Koding“" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/ca_ES/gitlab.po b/locale/ca_ES/gitlab.po index 1a052348522..e45666774aa 100644 --- a/locale/ca_ES/gitlab.po +++ b/locale/ca_ES/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/cs_CZ/gitlab.po b/locale/cs_CZ/gitlab.po index 3a2267c4bf7..8c822eb34c2 100644 --- a/locale/cs_CZ/gitlab.po +++ b/locale/cs_CZ/gitlab.po @@ -4338,12 +4338,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6858,9 +6852,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/da_DK/gitlab.po b/locale/da_DK/gitlab.po index 1a6e564ed36..f164cd3197a 100644 --- a/locale/da_DK/gitlab.po +++ b/locale/da_DK/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/de/gitlab.po b/locale/de/gitlab.po index c27a0dea04d..0ad934c4b1e 100644 --- a/locale/de/gitlab.po +++ b/locale/de/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "Koding einrichten" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/en/gitlab.po b/locale/en/gitlab.po index b50685514e1..5e14e94e6fc 100644 --- a/locale/en/gitlab.po +++ b/locale/en/gitlab.po @@ -882,9 +882,6 @@ msgstr "" msgid "Set up CI" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up auto deploy" msgstr "" diff --git a/locale/eo/gitlab.po b/locale/eo/gitlab.po index d0a67a1d089..a351bb8da8f 100644 --- a/locale/eo/gitlab.po +++ b/locale/eo/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "Agordi „Koding“" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po index 6ce5b6a3aff..9471694eb25 100644 --- a/locale/es/gitlab.po +++ b/locale/es/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "Junio" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "Configurar Koding" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/et_EE/gitlab.po b/locale/et_EE/gitlab.po index 8e4edc84c83..eae6a0cb157 100644 --- a/locale/et_EE/gitlab.po +++ b/locale/et_EE/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/fil_PH/gitlab.po b/locale/fil_PH/gitlab.po index 73eeb56bea2..381aec3b767 100644 --- a/locale/fil_PH/gitlab.po +++ b/locale/fil_PH/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/fr/gitlab.po b/locale/fr/gitlab.po index 93b30d0ef31..78f701f7ac0 100644 --- a/locale/fr/gitlab.po +++ b/locale/fr/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "juin" msgid "June" msgstr "juin" -msgid "Koding" -msgstr "Koding" - -msgid "Koding Dashboard" -msgstr "Tableau de bord Koding" - msgid "Kubernetes" msgstr "Kubernetes" @@ -6774,9 +6768,6 @@ msgstr "Définissez les exigences pour la connexion d’un utilisateur. Activez msgid "Set up CI/CD" msgstr "Configuration CI/CD" -msgid "Set up Koding" -msgstr "Configurer Koding" - msgid "Set up a %{type} Runner manually" msgstr "Configurer manuellement un exécuteur %{type}" diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8e0324eb194..2f91f55aa3e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3424,12 +3424,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -4197,9 +4191,6 @@ msgstr "" msgid "One or more of your Google Code projects cannot be imported into GitLab directly because they use Subversion or Mercurial for version control, rather than Git." msgstr "" -msgid "Online IDE integration settings." -msgstr "" - msgid "Only admins" msgstr "" @@ -5425,9 +5416,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/gl_ES/gitlab.po b/locale/gl_ES/gitlab.po index c77dc236458..a8536be2f5f 100644 --- a/locale/gl_ES/gitlab.po +++ b/locale/gl_ES/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/he_IL/gitlab.po b/locale/he_IL/gitlab.po index ab014982a72..75af6800707 100644 --- a/locale/he_IL/gitlab.po +++ b/locale/he_IL/gitlab.po @@ -4338,12 +4338,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6858,9 +6852,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/id_ID/gitlab.po b/locale/id_ID/gitlab.po index d5c48520155..090faf3c6a7 100644 --- a/locale/id_ID/gitlab.po +++ b/locale/id_ID/gitlab.po @@ -4230,12 +4230,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6732,9 +6726,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/it/gitlab.po b/locale/it/gitlab.po index 87bcd939fb1..59d31ec7ad2 100644 --- a/locale/it/gitlab.po +++ b/locale/it/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "Giu" msgid "June" msgstr "Giugno" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "Configura Koding" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po index ee5ea023fb5..7ebe6b610b7 100644 --- a/locale/ja/gitlab.po +++ b/locale/ja/gitlab.po @@ -4230,12 +4230,6 @@ msgstr "6月" msgid "June" msgstr "6月" -msgid "Koding" -msgstr "Koding" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "Kubernetes" @@ -6732,9 +6726,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "CI/CD を設定" -msgid "Set up Koding" -msgstr "Koding を設定" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/ko/gitlab.po b/locale/ko/gitlab.po index 3c3bcf9688a..1094e5103cd 100644 --- a/locale/ko/gitlab.po +++ b/locale/ko/gitlab.po @@ -4230,12 +4230,6 @@ msgstr "6월" msgid "June" msgstr "6월" -msgid "Koding" -msgstr "Koding" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6732,9 +6726,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "Koding 설정" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/mn_MN/gitlab.po b/locale/mn_MN/gitlab.po index 0ed5a747cfd..0985b0c09e4 100644 --- a/locale/mn_MN/gitlab.po +++ b/locale/mn_MN/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/nb_NO/gitlab.po b/locale/nb_NO/gitlab.po index b04b3bb68ef..c5206c28e4b 100644 --- a/locale/nb_NO/gitlab.po +++ b/locale/nb_NO/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/nl_NL/gitlab.po b/locale/nl_NL/gitlab.po index f354ca50f32..8fa799f9af5 100644 --- a/locale/nl_NL/gitlab.po +++ b/locale/nl_NL/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/pl_PL/gitlab.po b/locale/pl_PL/gitlab.po index 1d6dc4c4399..4a54f1546e5 100644 --- a/locale/pl_PL/gitlab.po +++ b/locale/pl_PL/gitlab.po @@ -4338,12 +4338,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6858,9 +6852,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/pt_BR/gitlab.po b/locale/pt_BR/gitlab.po index c76c639e8db..bcafb19a0d7 100644 --- a/locale/pt_BR/gitlab.po +++ b/locale/pt_BR/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "Jun" msgid "June" msgstr "Junho" -msgid "Koding" -msgstr "Koding" - -msgid "Koding Dashboard" -msgstr "Painel de controle do Koding" - msgid "Kubernetes" msgstr "Kubernetes" @@ -6774,9 +6768,6 @@ msgstr "Definir requisitos para um usuário entrar. Ative a autenticação obrig msgid "Set up CI/CD" msgstr "Configurar CI/CD" -msgid "Set up Koding" -msgstr "Configurar Koding" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/ro_RO/gitlab.po b/locale/ro_RO/gitlab.po index bae64f360fc..0b0e0af6134 100644 --- a/locale/ro_RO/gitlab.po +++ b/locale/ro_RO/gitlab.po @@ -4302,12 +4302,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6816,9 +6810,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/ru/gitlab.po b/locale/ru/gitlab.po index bc2c26da457..8787d69a7d3 100644 --- a/locale/ru/gitlab.po +++ b/locale/ru/gitlab.po @@ -4338,12 +4338,6 @@ msgstr "Июн." msgid "June" msgstr "Июнь" -msgid "Koding" -msgstr "Koding" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "Kubernetes" @@ -6858,9 +6852,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "Настройка CI/CD" -msgid "Set up Koding" -msgstr "Настройка Koding" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/sq_AL/gitlab.po b/locale/sq_AL/gitlab.po index 42eeed11534..2c47284e263 100644 --- a/locale/sq_AL/gitlab.po +++ b/locale/sq_AL/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/tr_TR/gitlab.po b/locale/tr_TR/gitlab.po index d1087ffd29e..c7bd500c267 100644 --- a/locale/tr_TR/gitlab.po +++ b/locale/tr_TR/gitlab.po @@ -4266,12 +4266,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6774,9 +6768,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po index 33019a3e5a8..c8199217be2 100644 --- a/locale/uk/gitlab.po +++ b/locale/uk/gitlab.po @@ -4338,12 +4338,6 @@ msgstr "чер." msgid "June" msgstr "червень" -msgid "Koding" -msgstr "Koding" - -msgid "Koding Dashboard" -msgstr "Панель керування Koding" - msgid "Kubernetes" msgstr "Kubernetes" @@ -6858,9 +6852,6 @@ msgstr "Встановіть вимоги для входу користувач msgid "Set up CI/CD" msgstr "Налаштування CI/CD" -msgid "Set up Koding" -msgstr "Налаштування Koding" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po index 861e459bcac..6430e769b12 100644 --- a/locale/zh_CN/gitlab.po +++ b/locale/zh_CN/gitlab.po @@ -4230,12 +4230,6 @@ msgstr "六" msgid "June" msgstr "六月" -msgid "Koding" -msgstr "Koding" - -msgid "Koding Dashboard" -msgstr "Koding仪表板" - msgid "Kubernetes" msgstr "Kubernetes" @@ -6732,9 +6726,6 @@ msgstr "设定用户登录的条件。启用强制双重认证。" msgid "Set up CI/CD" msgstr "配置 CI/CD" -msgid "Set up Koding" -msgstr "设置 Koding" - msgid "Set up a %{type} Runner manually" msgstr "手动设置%{type}Runner " diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po index 3ecd9fc4cd2..0fae98f02e7 100644 --- a/locale/zh_HK/gitlab.po +++ b/locale/zh_HK/gitlab.po @@ -4230,12 +4230,6 @@ msgstr "" msgid "June" msgstr "" -msgid "Koding" -msgstr "" - -msgid "Koding Dashboard" -msgstr "" - msgid "Kubernetes" msgstr "" @@ -6732,9 +6726,6 @@ msgstr "" msgid "Set up CI/CD" msgstr "" -msgid "Set up Koding" -msgstr "設置 Koding" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/locale/zh_TW/gitlab.po b/locale/zh_TW/gitlab.po index bb907d9a583..eae9d60b50c 100644 --- a/locale/zh_TW/gitlab.po +++ b/locale/zh_TW/gitlab.po @@ -4230,12 +4230,6 @@ msgstr "六月" msgid "June" msgstr "六月" -msgid "Koding" -msgstr "Koding" - -msgid "Koding Dashboard" -msgstr "Koding 控制面板" - msgid "Kubernetes" msgstr "Kubernetes" @@ -6732,9 +6726,6 @@ msgstr "設定使用者登入的需求。啟用強制性的兩步驟驗證。" msgid "Set up CI/CD" msgstr "設定 CI/CD" -msgid "Set up Koding" -msgstr "設定 Koding" - msgid "Set up a %{type} Runner manually" msgstr "" diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb index 6fe21579e8e..df2b492ae6b 100644 --- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb +++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb @@ -350,41 +350,6 @@ describe 'Projects > Show > User sees setup shortcut buttons' do end end end - - describe '"Set up Koding" button' do - it 'no "Set up Koding" button if Koding disabled' do - stub_application_setting(koding_enabled?: false) - - visit project_path(project) - - page.within('.project-stats') do - expect(page).not_to have_link('Set up Koding') - end - end - - it 'no "Set up Koding" button if the project already has a .koding.yml' do - stub_application_setting(koding_enabled?: true) - allow(Gitlab::CurrentSettings.current_application_settings).to receive(:koding_url).and_return('http://koding.example.com') - expect(project.repository.changelog).not_to be_nil - allow_any_instance_of(Repository).to receive(:koding_yml).and_return(project.repository.changelog) - - visit project_path(project) - - page.within('.project-stats') do - expect(page).not_to have_link('Set up Koding') - end - end - - it '"Set up Koding" button linked to new file populated for a .koding.yml' do - stub_application_setting(koding_enabled?: true) - - visit project_path(project) - - page.within('.project-stats') do - expect(page).to have_link('Set up Koding', href: presenter.add_koding_stack_path) - end - end - end end end end diff --git a/spec/features/security/dashboard_access_spec.rb b/spec/features/security/dashboard_access_spec.rb index 149bd32e736..0c893e65d9c 100644 --- a/spec/features/security/dashboard_access_spec.rb +++ b/spec/features/security/dashboard_access_spec.rb @@ -43,20 +43,6 @@ describe "Dashboard access" do it { is_expected.to be_allowed_for :visitor } end - describe "GET /koding" do - subject { koding_path } - - context 'with Koding enabled' do - before do - stub_application_setting(koding_enabled?: true) - end - - it { is_expected.to be_allowed_for :admin } - it { is_expected.to be_allowed_for :user } - it { is_expected.to be_denied_for :visitor } - end - end - describe "GET /projects/new" do it { expect(new_project_path).to be_allowed_for :admin } it { expect(new_project_path).to be_allowed_for :user } diff --git a/spec/fixtures/valid.po b/spec/fixtures/valid.po index e43fd5fea15..dbe2f952bad 100644 --- a/spec/fixtures/valid.po +++ b/spec/fixtures/valid.po @@ -790,9 +790,6 @@ msgstr "Establezca una contraseña en su cuenta para actualizar o enviar a trav msgid "Set up CI" msgstr "Configurar CI" -msgid "Set up Koding" -msgstr "Configurar Koding" - msgid "Set up auto deploy" msgstr "Configurar auto despliegue" diff --git a/spec/lib/gitlab/file_detector_spec.rb b/spec/lib/gitlab/file_detector_spec.rb index 9e351368b22..294ec2c2fd6 100644 --- a/spec/lib/gitlab/file_detector_spec.rb +++ b/spec/lib/gitlab/file_detector_spec.rb @@ -46,10 +46,6 @@ describe Gitlab::FileDetector do expect(described_class.type_of('.gitignore')).to eq(:gitignore) end - it 'returns the type of a Koding config file' do - expect(described_class.type_of('.koding.yml')).to eq(:koding) - end - it 'returns the type of a GitLab CI config file' do expect(described_class.type_of('.gitlab-ci.yml')).to eq(:gitlab_ci) end diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index aed8e02cc23..6e3f03f281b 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1567,7 +1567,6 @@ describe Repository do :license_blob, :license_key, :gitignore, - :koding_yml, :gitlab_ci_yml, :branch_names, :tag_names, @@ -1921,19 +1920,6 @@ describe Repository do end end - describe '#koding_yml', :use_clean_rails_memory_store_caching do - it 'returns and caches the output' do - expect(repository).to receive(:file_on_head) - .with(:koding) - .and_return(Gitlab::Git::Tree.new(path: '.koding.yml')) - .once - - 2.times do - expect(repository.koding_yml).to be_an_instance_of(Gitlab::Git::Tree) - end - end - end - describe '#readme', :use_clean_rails_memory_store_caching do context 'with a non-existing repository' do it 'returns nil' do diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb index 96193784072..3eb2f149311 100644 --- a/spec/presenters/project_presenter_spec.rb +++ b/spec/presenters/project_presenter_spec.rb @@ -410,36 +410,5 @@ describe ProjectPresenter do end end end - - describe '#koding_anchor_data' do - it 'returns link to set up Koding if user can push and no koding YML exists' do - project.add_developer(user) - allow(project.repository).to receive(:koding_yml).and_return(nil) - allow(Gitlab::CurrentSettings).to receive(:koding_enabled?).and_return(true) - - expect(presenter.koding_anchor_data).to have_attributes(enabled: false, - label: 'Set up Koding', - link: presenter.add_koding_stack_path) - end - - it 'returns nil if user cannot push' do - expect(presenter.koding_anchor_data).to be_nil - end - - it 'returns nil if koding is not enabled' do - project.add_developer(user) - allow(Gitlab::CurrentSettings).to receive(:koding_enabled?).and_return(false) - - expect(presenter.koding_anchor_data).to be_nil - end - - it 'returns nil if koding YML already exists' do - project.add_developer(user) - allow(project.repository).to receive(:koding_yml).and_return(double) - allow(Gitlab::CurrentSettings).to receive(:koding_enabled?).and_return(true) - - expect(presenter.koding_anchor_data).to be_nil - end - end end end diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb index fb1be16a111..84c7210f6bb 100644 --- a/spec/requests/api/settings_spec.rb +++ b/spec/requests/api/settings_spec.rb @@ -13,8 +13,6 @@ describe API::Settings, 'Settings' do expect(json_response['default_projects_limit']).to eq(42) expect(json_response['password_authentication_enabled_for_web']).to be_truthy expect(json_response['repository_storages']).to eq(['default']) - expect(json_response['koding_enabled']).to be_falsey - expect(json_response['koding_url']).to be_nil expect(json_response['plantuml_enabled']).to be_falsey expect(json_response['plantuml_url']).to be_nil expect(json_response['default_project_visibility']).to be_a String @@ -47,8 +45,6 @@ describe API::Settings, 'Settings' do default_projects_limit: 3, password_authentication_enabled_for_web: false, repository_storages: ['custom'], - koding_enabled: true, - koding_url: 'http://koding.example.com', plantuml_enabled: true, plantuml_url: 'http://plantuml.example.com', default_snippet_visibility: 'internal', @@ -72,8 +68,6 @@ describe API::Settings, 'Settings' do expect(json_response['default_projects_limit']).to eq(3) expect(json_response['password_authentication_enabled_for_web']).to be_falsey expect(json_response['repository_storages']).to eq(['custom']) - expect(json_response['koding_enabled']).to be_truthy - expect(json_response['koding_url']).to eq('http://koding.example.com') expect(json_response['plantuml_enabled']).to be_truthy expect(json_response['plantuml_url']).to eq('http://plantuml.example.com') expect(json_response['default_snippet_visibility']).to eq('internal') @@ -112,15 +106,6 @@ describe API::Settings, 'Settings' do expect(json_response['performance_bar_allowed_group_id']).to be_nil end - context "missing koding_url value when koding_enabled is true" do - it "returns a blank parameter error message" do - put api("/application/settings", admin), koding_enabled: true - - expect(response).to have_gitlab_http_status(400) - expect(json_response['error']).to eq('koding_url is missing') - end - end - context "missing plantuml_url value when plantuml_enabled is true" do it "returns a blank parameter error message" do put api("/application/settings", admin), plantuml_enabled: true diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index dd8f6239587..a170bb14144 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -140,13 +140,6 @@ describe HelpController, "routing" do end end -# koding GET /koding(.:format) koding#index -describe KodingController, "routing" do - it "to #index" do - expect(get("/koding")).to route_to('koding#index') - end -end - # profile_account GET /profile/account(.:format) profile#account # profile_history GET /profile/history(.:format) profile#history # profile_password PUT /profile/password(.:format) profile#password_update |
