summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-24 14:16:21 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-24 14:16:21 +0100
commitd21b3a0211061a2fed5949e92320f100ab3df05b (patch)
treef098f7a27c88ba4fb543c1cf9f2185f522b97e12
parentffe5ac41b84c342a8b1d099afe116cb1522da8f2 (diff)
downloadgitlab-ce-d21b3a0211061a2fed5949e92320f100ab3df05b.tar.gz
Add links to CI setup documentation from project settings and builds pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/_builds_settings.html.haml8
-rw-r--r--app/views/projects/builds/index.html.haml3
3 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d9be95defd1..c5b316c66b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.7.0 (unreleased)
- Preserve time notes/comments have been updated at when moving issue
- Make HTTP(s) label consistent on clone bar (Stan Hu)
- Fix avatar stretching by providing a cropping feature
+ - Add links to CI setup documentation from project settings and builds pages
v 8.6.1
- Add option to reload the schema before restoring a database backup. !2807
diff --git a/app/views/projects/_builds_settings.html.haml b/app/views/projects/_builds_settings.html.haml
index 95ab9ecf3e8..f1edc800bbf 100644
--- a/app/views/projects/_builds_settings.html.haml
+++ b/app/views/projects/_builds_settings.html.haml
@@ -1,6 +1,14 @@
%fieldset.builds-feature
%legend
Builds:
+
+ - unless @project.builds.any?
+ .form-group
+ .col-sm-offset-2.col-sm-10
+ %p Before you can use Builds (Continuous Integration) feature you need to setup it.
+ = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
+ %hr
+
.form-group
.col-sm-offset-2.col-sm-10
%p Get recent application code using the following command:
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 811d304ea75..d21716e4887 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -27,6 +27,9 @@
= link_to 'Cancel running', cancel_all_namespace_project_builds_path(@project.namespace, @project),
data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
+ - unless @project.builds.any?
+ = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
+
= link_to ci_lint_path, class: 'btn btn-default' do
= icon('wrench')
%span CI Lint