diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-04 17:08:41 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-04 17:08:41 +0000 |
| commit | 2c78c7f4cdb1fae2650563f80feb294d2b7e5d80 (patch) | |
| tree | a4c0d64344178d842c966a02ffb493480ffd49f8 /app/models/project.rb | |
| parent | d453bb863593f7d5daab2a3e88ff1f18139d7eb1 (diff) | |
| download | gitlab-ce-2c78c7f4cdb1fae2650563f80feb294d2b7e5d80.tar.gz | |
Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643
This reverts merge request !12557
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 241e7e60dd2..8e9e42d28ab 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -815,7 +815,7 @@ class Project < ActiveRecord::Base end def ci_service - @ci_service ||= ci_services.reorder(nil).find_by(active: true) + @ci_service ||= ci_services.find_by(active: true) end def deployment_services @@ -823,7 +823,7 @@ class Project < ActiveRecord::Base end def deployment_service - @deployment_service ||= deployment_services.reorder(nil).find_by(active: true) + @deployment_service ||= deployment_services.find_by(active: true) end def monitoring_services @@ -831,7 +831,7 @@ class Project < ActiveRecord::Base end def monitoring_service - @monitoring_service ||= monitoring_services.reorder(nil).find_by(active: true) + @monitoring_service ||= monitoring_services.find_by(active: true) end def jira_tracker? |