This instance will be upgraded to Heptapod 0.27.1 on 2021-12-02 at 15:00 UTC+1 (a few minutes of down time)

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

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

parent 65033ccbeb9a
......@@ -9,7 +9,7 @@ class Projects::ServicesController < Projects::ApplicationController
def index
@project.build_missing_services
@services = @project.services.where.not(type: 'GitlabIssueTrackerService').reload
@services = @project.services.visible.reload
end
def edit
......
......@@ -317,11 +317,7 @@ def issue_exists?(issue_id)
end
def default_issue_tracker
unless gitlab_issue_tracker_service
create_gitlab_issue_tracker_service
end
gitlab_issue_tracker_service
gitlab_issue_tracker_service ||= create_gitlab_issue_tracker_service
end
def issues_tracker
......
......@@ -20,6 +20,6 @@ def new_issue_url
end
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
......@@ -26,6 +26,8 @@ class Service < ActiveRecord::Base
validates :project_id, presence: true
scope :visible, -> { where.not(type: 'GitlabIssueTrackerService') }
def activated?
active
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