Commit 52739518bc8c01f0c9821b01ce5bc3bcd92f2159
1 parent
78e591c7
Exists in
master
and in
4 other branches
Make clearer use of the check.
Showing
1 changed file
with
10 additions
and
6 deletions
Show diff stats
app/helpers/issues_helper.rb
| @@ -16,7 +16,7 @@ module IssuesHelper | @@ -16,7 +16,7 @@ module IssuesHelper | ||
| 16 | def url_for_project_issues | 16 | def url_for_project_issues |
| 17 | return "" if @project.nil? | 17 | return "" if @project.nil? |
| 18 | 18 | ||
| 19 | - if @project.used_default_issues_tracker? || config_issues_tracker? | 19 | + if @project.used_default_issues_tracker? || !external_issues_tracker_enabled? |
| 20 | project_issues_path(@project) | 20 | project_issues_path(@project) |
| 21 | else | 21 | else |
| 22 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"] | 22 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"] |
| @@ -28,7 +28,7 @@ module IssuesHelper | @@ -28,7 +28,7 @@ module IssuesHelper | ||
| 28 | def url_for_new_issue | 28 | def url_for_new_issue |
| 29 | return "" if @project.nil? | 29 | return "" if @project.nil? |
| 30 | 30 | ||
| 31 | - if @project.used_default_issues_tracker? || config_issues_tracker? | 31 | + if @project.used_default_issues_tracker? || !external_issues_tracker_enabled? |
| 32 | url = new_project_issue_path project_id: @project | 32 | url = new_project_issue_path project_id: @project |
| 33 | else | 33 | else |
| 34 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"] | 34 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"] |
| @@ -40,7 +40,7 @@ module IssuesHelper | @@ -40,7 +40,7 @@ module IssuesHelper | ||
| 40 | def url_for_issue(issue_iid) | 40 | def url_for_issue(issue_iid) |
| 41 | return "" if @project.nil? | 41 | return "" if @project.nil? |
| 42 | 42 | ||
| 43 | - if @project.used_default_issues_tracker? || config_issues_tracker? | 43 | + if @project.used_default_issues_tracker? || !external_issues_tracker_enabled? |
| 44 | url = project_issue_url project_id: @project, id: issue_iid | 44 | url = project_issue_url project_id: @project, id: issue_iid |
| 45 | else | 45 | else |
| 46 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"] | 46 | url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"] |
| @@ -60,8 +60,12 @@ module IssuesHelper | @@ -60,8 +60,12 @@ module IssuesHelper | ||
| 60 | end | 60 | end |
| 61 | end | 61 | end |
| 62 | 62 | ||
| 63 | - def config_issues_tracker? | ||
| 64 | - return false if Gitlab.config.issues_tracker && Gitlab.config.issues_tracker.values.any? | ||
| 65 | - true | 63 | + # Checks if issues_tracker setting exists in gitlab.yml |
| 64 | + def external_issues_tracker_enabled? | ||
| 65 | + if Gitlab.config.issues_tracker && Gitlab.config.issues_tracker.values.any? | ||
| 66 | + true | ||
| 67 | + else | ||
| 68 | + false | ||
| 69 | + end | ||
| 66 | end | 70 | end |
| 67 | end | 71 | end |