-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master'
Koding Integration ## What does this MR do? Will provide Koding integration with GitLab services. Forked from !4914. ## Are there points in the code the reviewer needs to double check? I've introduced new layouts which might not be necessary, first time contributor. ## Why was this MR needed? We're planning to ship Koding with GitLab. ## What are the relevant issue numbers? #12759 #14698 ## Screenshots (if relevant) ### Screencasts http://recordit.co/BDMbhwgxPD http://recordit.co/By0qiz1ClC ### Enable Koding in Application Settings  ### Koding Dashboard  ### Set up Koding Stack 1 -  2 -  ### Run on Koding on Project Page  ### Run in IDE on Merge Requests  ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5909
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/assets/images/koding-logo.svg 8 additions, 0 deletionsapp/assets/images/koding-logo.svg
- app/controllers/admin/application_settings_controller.rb 2 additions, 0 deletionsapp/controllers/admin/application_settings_controller.rb
- app/controllers/koding_controller.rb 15 additions, 0 deletionsapp/controllers/koding_controller.rb
- app/helpers/application_settings_helper.rb 4 additions, 0 deletionsapp/helpers/application_settings_helper.rb
- app/helpers/projects_helper.rb 54 additions, 0 deletionsapp/helpers/projects_helper.rb
- app/models/application_setting.rb 6 additions, 0 deletionsapp/models/application_setting.rb
- app/models/repository.rb 9 additions, 1 deletionapp/models/repository.rb
- app/views/admin/application_settings/_form.html.haml 19 additions, 0 deletionsapp/views/admin/application_settings/_form.html.haml
- app/views/koding/index.html.haml 9 additions, 0 deletionsapp/views/koding/index.html.haml
- app/views/layouts/koding.html.haml 5 additions, 0 deletionsapp/views/layouts/koding.html.haml
- app/views/layouts/nav/_dashboard.html.haml 5 additions, 0 deletionsapp/views/layouts/nav/_dashboard.html.haml
- app/views/projects/buttons/_koding.html.haml 7 additions, 0 deletionsapp/views/projects/buttons/_koding.html.haml
- app/views/projects/merge_requests/_show.html.haml 3 additions, 0 deletionsapp/views/projects/merge_requests/_show.html.haml
- app/views/projects/show.html.haml 3 additions, 1 deletionapp/views/projects/show.html.haml
- config/routes.rb 5 additions, 0 deletionsconfig/routes.rb
- db/migrate/20160817133006_add_koding_to_application_settings.rb 10 additions, 0 deletions...rate/20160817133006_add_koding_to_application_settings.rb
- db/schema.rb 2 additions, 0 deletionsdb/schema.rb
- doc/integration/README.md 1 addition, 0 deletionsdoc/integration/README.md
- doc/integration/img/koding_build-in-progress.png 0 additions, 0 deletionsdoc/integration/img/koding_build-in-progress.png
Loading
Please register or sign in to comment