Download as
Browse Code »

Commit 78e591c737f65f7c5998d554d4c059b9a2d0674f

Authored by Marin Jankovski
1 parent ff046c72
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Use more descriptive name for config check.

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
app/helpers/issues_helper.rb
  Diff comments   View file @78e591c
... ... @@ -16,7 +16,7 @@ module IssuesHelper
16 16 def url_for_project_issues
17 17 return "" if @project.nil?
18 18  
19   - if @project.used_default_issues_tracker? || config_disabled?
  19 + if @project.used_default_issues_tracker? || config_issues_tracker?
20 20 project_issues_path(@project)
21 21 else
22 22 url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"]
... ... @@ -28,7 +28,7 @@ module IssuesHelper
28 28 def url_for_new_issue
29 29 return "" if @project.nil?
30 30  
31   - if @project.used_default_issues_tracker? || config_disabled?
  31 + if @project.used_default_issues_tracker? || config_issues_tracker?
32 32 url = new_project_issue_path project_id: @project
33 33 else
34 34 url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"]
... ... @@ -40,7 +40,7 @@ module IssuesHelper
40 40 def url_for_issue(issue_iid)
41 41 return "" if @project.nil?
42 42  
43   - if @project.used_default_issues_tracker? || config_disabled?
  43 + if @project.used_default_issues_tracker? || config_issues_tracker?
44 44 url = project_issue_url project_id: @project, id: issue_iid
45 45 else
46 46 url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"]
... ... @@ -60,7 +60,7 @@ module IssuesHelper
60 60 end
61 61 end
62 62  
63   - def config_disabled?
  63 + def config_issues_tracker?
64 64 return false if Gitlab.config.issues_tracker && Gitlab.config.issues_tracker.values.any?
65 65 true
66 66 end
... ...