summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/controllers/ci/helps_controller.rb16
-rw-r--r--app/views/ci/helps/oauth2.html.haml20
-rw-r--r--app/views/ci/helps/show.html.haml40
-rw-r--r--config/routes.rb4
4 files changed, 0 insertions, 80 deletions
diff --git a/app/controllers/ci/helps_controller.rb b/app/controllers/ci/helps_controller.rb
deleted file mode 100644
index a1ee4111614..00000000000
--- a/app/controllers/ci/helps_controller.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Ci
- class HelpsController < Ci::ApplicationController
- skip_filter :check_config
-
- def show
- end
-
- def oauth2
- if valid_config?
- redirect_to ci_root_path
- else
- render layout: 'ci/empty'
- end
- end
- end
-end
diff --git a/app/views/ci/helps/oauth2.html.haml b/app/views/ci/helps/oauth2.html.haml
deleted file mode 100644
index 2031b7340d4..00000000000
--- a/app/views/ci/helps/oauth2.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-.welcome-block
- %h1
- Welcome to GitLab CI
- %p
- GitLab CI integrates with your GitLab installation and runs tests for your projects.
-
- %h3 You need only 2 steps to set it up
-
- %ol
- %li
- In the GitLab admin area under OAuth applications create a new entry. The redirect url should be
- %code= callback_ci_user_sessions_url
- %li
- Update the GitLab CI config with the application id and the application secret from GitLab.
- %li
- Restart your GitLab CI instance
- %li
- Refresh this page when GitLab CI has started again
-
-
diff --git a/app/views/ci/helps/show.html.haml b/app/views/ci/helps/show.html.haml
deleted file mode 100644
index 9b32d529c60..00000000000
--- a/app/views/ci/helps/show.html.haml
+++ /dev/null
@@ -1,40 +0,0 @@
-.jumbotron
- %h2
- GitLab CI
- %span= GitlabCi::VERSION
- %small= GitlabCi::REVISION
- %p
- GitLab CI integrates with your GitLab installation and run tests for your projects.
- %br
- Login with your GitLab account, add a project with one click and enjoy running your tests.
- %br
- Read more about GitLab CI at #{link_to "about.gitlab.com/gitlab-ci", "https://about.gitlab.com/gitlab-ci/", target: "_blank"}.
-
-
-.bs-callout.bs-callout-success
- %h4
- = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/api' do
- %i.fa.fa-cogs
- API
- %p Explore how you can access GitLab CI via the API.
-
-.bs-callout.bs-callout-info
- %h4
- = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/tree/master/doc/examples' do
- %i.fa.fa-info-sign
- Build script examples
- %p This includes the build script we use to test GitLab CE.
-
-.bs-callout.bs-callout-danger
- %h4
- = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/issues' do
- %i.fa.fa-bug
- Issue tracker
- %p Reports about recent bugs and problems..
-
-.bs-callout.bs-callout-warning
- %h4
- = link_to 'http://feedback.gitlab.com/forums/176466-general/category/64310-gitlab-ci' do
- %i.fa.fa-thumbs-up
- Feedback forum
- %p Suggest improvements or new features for GitLab CI.
diff --git a/config/routes.rb b/config/routes.rb
index 41970d2af8a..b5a84c1f192 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,10 +9,6 @@ Gitlab::Application.routes.draw do
resource :lint, only: [:show, :create]
- resource :help do
- get :oauth2
- end
-
resources :projects do
collection do
post :add