Commit 0aec0d53 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'remove-ci-help' into 'master'

Remove CI help

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2556

See merge request !1325
parents 0e1948fb 7166f7b7
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
.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
.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.
......@@ -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
......
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