Skip to content

G
gitlab-ce
Commit 0602fcb6 authored by Douwe Maan's avatar Douwe Maan
Browse files
Options

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

Remove Koding integration and documentation

Closes #39697

See merge request gitlab-org/gitlab-ce!22334
parents bf47fc8b 8a934b06
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 1052 deletions
app/assets/images/koding-logo.svg deleted 100644 → 0
View file @ bf47fc8b
<?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
app/controllers/koding_controller.rb deleted 100644 → 0
View file @ bf47fc8b
# 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
app/helpers/application_settings_helper.rb
View file @ 0602fcb6
......@@ -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,
......
app/helpers/projects_helper.rb
View file @ 0602fcb6
......@@ -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)
......
app/models/application_setting.rb
View file @ 0602fcb6
......@@ -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,
......
app/models/repository.rb
View file @ 0602fcb6
......@@ -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
......
app/presenters/project_presenter.rb
View file @ 0602fcb6
......@@ -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
app/views/admin/application_settings/_koding.html.haml deleted 100644 → 0
View file @ bf47fc8b
= 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"
app/views/admin/application_settings/show.html.haml
View file @ 0602fcb6
......@@ -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?) }
......
app/views/koding/index.html.haml deleted 100644 → 0
View file @ bf47fc8b
.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}
app/views/layouts/koding.html.haml deleted 100644 → 0
View file @ bf47fc8b
- page_title _("Koding")
- page_description _("Koding Dashboard")
- header_title _("Koding"), koding_path
= render template: "layouts/application"
app/views/projects/_home_panel.html.haml
View file @ 0602fcb6
......@@ -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
......
app/views/projects/buttons/_koding.html.haml deleted 100644 → 0
View file @ bf47fc8b
- 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)')
changelogs/unreleased/sh-remove-koding.yml 0 → 100644
View file @ 0602fcb6
---
title: Remove Koding integration and documentation
merge_request: 22334
author:
type: removed
config/routes.rb
View file @ 0602fcb6
......@@ -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
......
db/post_migrate/20181013005024_remove_koding_from_application_settings.rb 0 → 100644
View file @ 0602fcb6
# 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
db/schema.rb
View file @ 0602fcb6
......@@ -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"
......
doc/administration/integration/koding.md deleted 100644 → 0
View file @ bf47fc8b
# 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
doc/api/settings.md
View file @ 0602fcb6
......@@ -49,8 +49,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,
......@@ -107,8 +105,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,
......@@ -179,8 +175,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 |
......
doc/user/project/koding.md deleted 100644 → 0
View file @ bf47fc8b
# 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`).
![Enable Koding](img/koding_enable-koding.png)
Once enabled you will see `Koding` link on your sidebar which leads you to
Koding Landing page.
![Koding Landing](img/koding_landing.png)
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;
![Set Up Koding](img/koding_set-up-ide.png)
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.
![Commit .koding.yml](img/koding_commit-koding.yml.png)
## 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.
![Run on Koding](img/koding_run-in-ide.png)
This will open Koding defined in the settings in a new window and will start
importing the project's stack file.
![Import Stack](img/koding_stack-import.png)
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**.
![Stack Building](img/koding_start-build.png)
This will take time depending on the required environment.
![Stack Building in Progress](img/koding_build-in-progress.png)
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).
![Stack Building Success](img/koding_build-success.png)
You can check out the `Build Logs` from this success modal as well.
![Stack Build Logs](img/koding_build-logs.png)
You can now `Start Coding`!
![Edit On IDE](img/koding_edit-on-ide.png)
## 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;
![Run in IDE on MR](img/koding_run-mr-in-ide.png)
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;
![Different Branch for MR](img/koding_different-stack-on-mr-try.png)
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.
![Open GitLab from Koding](img/koding_open-gitlab-from-koding.png)
## 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
doc/user/reserved_names.md
View file @ 0602fcb6
......@@ -68,7 +68,6 @@ Currently the following names are reserved as top level groups:
- import
- invites
- jwt
- koding
- notification_settings
- oauth
- profile
......
lib/api/settings.rb
View file @ 0602fcb6
......@@ -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'
......
lib/gitlab/file_detector.rb
View file @ 0602fcb6
......@@ -18,7 +18,6 @@ module Gitlab
# Configuration files
gitignore: '.gitignore',
koding: '.koding.yml',
gitlab_ci: '.gitlab-ci.yml',
route_map: '.gitlab/route-map.yml',
......
lib/gitlab/path_regex.rb
View file @ 0602fcb6
......@@ -39,7 +39,6 @@ module Gitlab
import
invites
jwt
koding
login
notification_settings
oauth
......
locale/ar_SA/gitlab.po
View file @ 0602fcb6
......@@ -4410,12 +4410,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5391,9 +5385,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 ""
......@@ -6942,9 +6933,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/bg/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr "Настройка на „Koding“"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/ca_ES/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/cs_CZ/gitlab.po
View file @ 0602fcb6
......@@ -4338,12 +4338,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5311,9 +5305,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 ""
......@@ -6858,9 +6849,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/da_DK/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/de/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr "Koding einrichten"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/en/gitlab.po
View file @ 0602fcb6
......@@ -882,9 +882,6 @@ msgstr ""
msgid "Set up CI"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up auto deploy"
msgstr ""
......
locale/eo/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr "Agordi „Koding“"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/es/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr "Junio"
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr "Configurar Koding"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/et_EE/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/fil_PH/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/fr/gitlab.po
View file @ 0602fcb6
......@@ -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"
......@@ -5231,9 +5225,6 @@ msgstr "Un ou plusieurs de vos projets Bitbucket ne peuvent être importés dire
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 "Un ou plusieurs de vos projets Google Code ne peuvent être importés directement dans GitLab parce qu’ils utilisent Subversion ou Mercurial comme gestionnaire de versions au lieu de Git."
msgid "Online IDE integration settings."
msgstr "Paramètres d’intégration de l’EDI en ligne."
msgid "Only admins"
msgstr "Seulement les administrateurs"
......@@ -6774,9 +6765,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}"
......
locale/gitlab.pot
View file @ 0602fcb6
......@@ -3439,12 +3439,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -4218,9 +4212,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 ""
......@@ -5467,9 +5458,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/gl_ES/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/he_IL/gitlab.po
View file @ 0602fcb6
......@@ -4338,12 +4338,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5311,9 +5305,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 ""
......@@ -6858,9 +6849,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/id_ID/gitlab.po
View file @ 0602fcb6
......@@ -4230,12 +4230,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5191,9 +5185,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 ""
......@@ -6732,9 +6723,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/it/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr "Giu"
msgid "June"
msgstr "Giugno"
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr "Configura Koding"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/ja/gitlab.po
View file @ 0602fcb6
......@@ -4230,12 +4230,6 @@ msgstr "6月"
msgid "June"
msgstr "6月"
msgid "Koding"
msgstr "Koding"
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr "Kubernetes"
......@@ -5191,9 +5185,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 "オンライン IDE 統合設定。"
msgid "Only admins"
msgstr ""
......@@ -6732,9 +6723,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr "CI/CD を設定"
msgid "Set up Koding"
msgstr "Koding を設定"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/ko/gitlab.po
View file @ 0602fcb6
......@@ -4230,12 +4230,6 @@ msgstr "6월"
msgid "June"
msgstr "6월"
msgid "Koding"
msgstr "Koding"
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5191,9 +5185,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 "온라인 IDE 통합 설정."
msgid "Only admins"
msgstr ""
......@@ -6732,9 +6723,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr "Koding 설정"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/mn_MN/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/nb_NO/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/nl_NL/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/pl_PL/gitlab.po
View file @ 0602fcb6
......@@ -4338,12 +4338,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5311,9 +5305,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 ""
......@@ -6858,9 +6849,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/pt_BR/gitlab.po
View file @ 0602fcb6
......@@ -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"
......@@ -5231,9 +5225,6 @@ msgstr "Um ou mais dos seus projetos do Bitbucket não podem ser importados dire
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 "Um ou mais dos seus projetos do Google Code não podem ser importados diretamente no GitLab porque eles usam Subversion ou Mercurial para o controle de versão, ao invés de Git."
msgid "Online IDE integration settings."
msgstr "Configurações de integração on-line do IDE."
msgid "Only admins"
msgstr ""
......@@ -6774,9 +6765,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 ""
......
locale/ro_RO/gitlab.po
View file @ 0602fcb6
......@@ -4302,12 +4302,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5271,9 +5265,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 ""
......@@ -6816,9 +6807,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/ru/gitlab.po
View file @ 0602fcb6
......@@ -4338,12 +4338,6 @@ msgstr "Июн."
msgid "June"
msgstr "Июнь"
msgid "Koding"
msgstr "Koding"
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr "Kubernetes"
......@@ -5311,9 +5305,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 ""
......@@ -6858,9 +6849,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr "Настройка CI/CD"
msgid "Set up Koding"
msgstr "Настройка Koding"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/sq_AL/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/tr_TR/gitlab.po
View file @ 0602fcb6
......@@ -4266,12 +4266,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5231,9 +5225,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 ""
......@@ -6774,9 +6765,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr ""
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/uk/gitlab.po
View file @ 0602fcb6
......@@ -4338,12 +4338,6 @@ msgstr "чер."
msgid "June"
msgstr "червень"
msgid "Koding"
msgstr "Koding"
msgid "Koding Dashboard"
msgstr "Панель керування Koding"
msgid "Kubernetes"
msgstr "Kubernetes"
......@@ -5311,9 +5305,6 @@ msgstr "Один або декілька ваших проектів Bitbucket
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 "Один або декілька ваших проектів Google Code не можна імпортувати безпосередньо в GitLab, оскільки вони використовують Subversion або Mercurial для контролю версій замість Git."
msgid "Online IDE integration settings."
msgstr "Налаштування інтеграції із онлайн IDE."
msgid "Only admins"
msgstr "Тільки Адміни"
......@@ -6858,9 +6849,6 @@ msgstr "Встановіть вимоги для входу користувач
msgid "Set up CI/CD"
msgstr "Налаштування CI/CD"
msgid "Set up Koding"
msgstr "Налаштування Koding"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/zh_CN/gitlab.po
View file @ 0602fcb6
......@@ -4230,12 +4230,6 @@ msgstr "六"
msgid "June"
msgstr "六月"
msgid "Koding"
msgstr "Koding"
msgid "Koding Dashboard"
msgstr "Koding仪表板"
msgid "Kubernetes"
msgstr "Kubernetes"
......@@ -5191,9 +5185,6 @@ msgstr "您的一个或多个Bitbucket项目无法直接导入GitLab，因为它
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 "您的一个或多个Google Code项目无法直接导入GitLab，因为它们使用Subversion或Mercurial进行版本控制，而不是Git。"
msgid "Online IDE integration settings."
msgstr "在线IDE集成设置。"
msgid "Only admins"
msgstr "仅管理员"
......@@ -6732,9 +6723,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 "
......
locale/zh_HK/gitlab.po
View file @ 0602fcb6
......@@ -4230,12 +4230,6 @@ msgstr ""
msgid "June"
msgstr ""
msgid "Koding"
msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes"
msgstr ""
......@@ -5191,9 +5185,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 ""
......@@ -6732,9 +6723,6 @@ msgstr ""
msgid "Set up CI/CD"
msgstr ""
msgid "Set up Koding"
msgstr "設置 Koding"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
locale/zh_TW/gitlab.po
View file @ 0602fcb6
......@@ -4230,12 +4230,6 @@ msgstr "六月"
msgid "June"
msgstr "六月"
msgid "Koding"
msgstr "Koding"
msgid "Koding Dashboard"
msgstr "Koding 控制面板"
msgid "Kubernetes"
msgstr "Kubernetes"
......@@ -5191,9 +5185,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 "線上 IDE 整合設定。"
msgid "Only admins"
msgstr ""
......@@ -6732,9 +6723,6 @@ msgstr "設定使用者登入的需求。啟用強制性的兩步驟驗證。"
msgid "Set up CI/CD"
msgstr "設定 CI/CD"
msgid "Set up Koding"
msgstr "設定 Koding"
msgid "Set up a %{type} Runner manually"
msgstr ""
......
spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
View file @ 0602fcb6
......@@ -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
spec/features/security/dashboard_access_spec.rb
View file @ 0602fcb6
......@@ -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 }
......
spec/fixtures/valid.po
View file @ 0602fcb6
......@@ -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"
......
spec/lib/gitlab/file_detector_spec.rb
View file @ 0602fcb6
......@@ -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
......
spec/models/repository_spec.rb
View file @ 0602fcb6
......@@ -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
......
spec/presenters/project_presenter_spec.rb
View file @ 0602fcb6
......@@ -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
spec/requests/api/settings_spec.rb
View file @ 0602fcb6
......@@ -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
......
spec/routing/routing_spec.rb
View file @ 0602fcb6
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7