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 /app/models | |
| 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
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 1 |
1 files changed, 1 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 |