diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-17 10:23:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-17 10:23:53 +0000 |
| commit | 5d010ecd8a3ed6e0a83b3c050c7bdfff833f77e1 (patch) | |
| tree | d9bf4a9ea711a0fe8021e5fd4c66d4bd6892c5f7 | |
| parent | 5e74c5c4db86c00379f809e4b47b1a2ae4abd03e (diff) | |
| parent | e9be3ec8ee8fe83e1e31a832e25223e5f2603074 (diff) | |
| download | gitlab-ce-5d010ecd8a3ed6e0a83b3c050c7bdfff833f77e1.tar.gz | |
Merge branch 'redirect-ci-dash' into 'master'
Temporary bring /ci page page with help information
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1630
| -rw-r--r-- | app/controllers/ci/projects_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/ci/projects/index.html.haml | 20 |
2 files changed, 23 insertions, 3 deletions
diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb index 96649ab815a..809b44387ba 100644 --- a/app/controllers/ci/projects_controller.rb +++ b/app/controllers/ci/projects_controller.rb @@ -1,8 +1,8 @@ module Ci class ProjectsController < Ci::ApplicationController - before_action :project - before_action :authenticate_user!, except: [:build, :badge] - before_action :authorize_access_project!, except: [:badge] + before_action :project, except: [:index] + before_action :authenticate_user!, except: [:index, :build, :badge] + before_action :authorize_access_project!, except: [:index, :badge] before_action :authorize_manage_project!, only: [:toggle_shared_runners, :dumped_yaml] before_action :no_cache, only: [:badge] protect_from_forgery diff --git a/app/views/ci/projects/index.html.haml b/app/views/ci/projects/index.html.haml new file mode 100644 index 00000000000..9c2290bc4a5 --- /dev/null +++ b/app/views/ci/projects/index.html.haml @@ -0,0 +1,20 @@ +.wiki + %h1 + GitLab CI is now integrated in GitLab UI + %h2 For existing projects + + %p + Check the following pages to find the CI status you're looking for: + + %ul + %li Projects page - shows CI status for each project. + %li Project commits page - show CI status for each commit. + + + + %h2 For new projects + + %p + If you want to enable CI for a new project it is easy as adding + = link_to ".gitlab-ci.yml", "http://doc.gitlab.com/ce/ci/yaml/README.html" + file to your repository |