diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-16 16:26:41 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-16 16:26:41 +0000 |
| commit | a0aa6453bd0099a0e1d0bfd6725fff8aaa9d29a9 (patch) | |
| tree | c924662fcbfda59f6ac389be68999a509a193760 | |
| parent | f4920b769f95c3fb024cc78db8a3fad6c6f8e46b (diff) | |
| parent | f9dc3a2fb59da4ca6192faa48a9b25850f99e1a7 (diff) | |
| download | gitlab-ce-a0aa6453bd0099a0e1d0bfd6725fff8aaa9d29a9.tar.gz | |
Merge branch 'add-links-to-ci' into 'master'
Add links from GitLab to CI
* link from dashboard to CI dashboard
* link from project to CI project
Its a fast solution for 8.0. Might be improved in later versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1313
| -rw-r--r-- | app/models/project.rb | 1 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 81951467d41..6e2f9645661 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -119,6 +119,7 @@ class Project < ActiveRecord::Base has_many :starrers, through: :users_star_projects, source: :user has_one :import_data, dependent: :destroy, class_name: "ProjectImportData" + has_one :gitlab_ci_project, dependent: :destroy, class_name: "Ci::Project", foreign_key: :gitlab_id delegate :name, to: :owner, allow_nil: true, prefix: true delegate :members, to: :team, prefix: true diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index c3b07200621..56283cba6bd 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -46,3 +46,8 @@ = icon('user fw') %span Profile Settings + = nav_link(controller: :ci) do + = link_to ci_root_path, title: 'Continuous Integration', data: {placement: 'right'} do + = icon('building fw') + %span + CI diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index dbecd1e7192..b347846c932 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -28,4 +28,8 @@ = render 'projects/buttons/dropdown' + - if @project.gitlab_ci? + = link_to ci_project_path(@project.gitlab_ci_project), class: 'btn btn-default' do + CI + = render "shared/clone_panel" |