Commit 68f73024 authored by Marin Jankovski's avatar Marin Jankovski

Add a scope for visible services, code styling changes for easier readability.

parent c6c7552e
No related merge requests found
...@@ -9,7 +9,7 @@ class Projects::ServicesController < Projects::ApplicationController ...@@ -9,7 +9,7 @@ class Projects::ServicesController < Projects::ApplicationController
def index def index
@project.build_missing_services @project.build_missing_services
@services = @project.services.where.not(type: 'GitlabIssueTrackerService').reload @services = @project.services.visible.reload
end end
def edit def edit
......
...@@ -317,11 +317,7 @@ class Project < ActiveRecord::Base ...@@ -317,11 +317,7 @@ class Project < ActiveRecord::Base
end end
def default_issue_tracker def default_issue_tracker
unless gitlab_issue_tracker_service gitlab_issue_tracker_service ||= create_gitlab_issue_tracker_service
create_gitlab_issue_tracker_service
end
gitlab_issue_tracker_service
end end
def issues_tracker def issues_tracker
......
...@@ -20,6 +20,6 @@ class GitlabIssueTrackerService < IssueTrackerService ...@@ -20,6 +20,6 @@ class GitlabIssueTrackerService < IssueTrackerService
end end
def issue_url(iid) def issue_url(iid)
"#{Gitlab.config.gitlab.url}#{project_issue_path project_id: project, id: iid}" "#{Gitlab.config.gitlab.url}#{project_issue_path(project_id: project, id: iid)}"
end end
end end
...@@ -26,6 +26,8 @@ class Service < ActiveRecord::Base ...@@ -26,6 +26,8 @@ class Service < ActiveRecord::Base
validates :project_id, presence: true validates :project_id, presence: true
scope :visible, -> { where.not(type: 'GitlabIssueTrackerService') }
def activated? def activated?
active active
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment