Commit 5e6f45b07f0c5b35f3c5ae0b9a49e14b79460d8d
1 parent
242f6aa2
Exists in
master
and in
4 other branches
Settings replaced by Gitlab.config
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
app/helpers/issues_helper.rb
| @@ -48,7 +48,7 @@ module IssuesHelper | @@ -48,7 +48,7 @@ module IssuesHelper | ||
| 48 | if @project.used_default_issues_tracker? | 48 | if @project.used_default_issues_tracker? |
| 49 | project_issues_filter_path(@project) | 49 | project_issues_filter_path(@project) |
| 50 | else | 50 | else |
| 51 | - url = Settings[:issues_tracker][@project.issues_tracker]["project_url"] | 51 | + url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"] |
| 52 | url.gsub(':project_id', @project.id.to_s) | 52 | url.gsub(':project_id', @project.id.to_s) |
| 53 | .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) | 53 | .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) |
| 54 | end | 54 | end |
| @@ -60,7 +60,7 @@ module IssuesHelper | @@ -60,7 +60,7 @@ module IssuesHelper | ||
| 60 | if @project.used_default_issues_tracker? | 60 | if @project.used_default_issues_tracker? |
| 61 | url = new_project_issue_path project_id: @project | 61 | url = new_project_issue_path project_id: @project |
| 62 | else | 62 | else |
| 63 | - url = Settings[:issues_tracker][@project.issues_tracker]["new_issue_url"] | 63 | + url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"] |
| 64 | url.gsub(':project_id', @project.id.to_s) | 64 | url.gsub(':project_id', @project.id.to_s) |
| 65 | .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) | 65 | .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) |
| 66 | end | 66 | end |
| @@ -72,7 +72,7 @@ module IssuesHelper | @@ -72,7 +72,7 @@ module IssuesHelper | ||
| 72 | if @project.used_default_issues_tracker? | 72 | if @project.used_default_issues_tracker? |
| 73 | url = project_issue_url project_id: @project, id: issue_id | 73 | url = project_issue_url project_id: @project, id: issue_id |
| 74 | else | 74 | else |
| 75 | - url = Settings[:issues_tracker][@project.issues_tracker]["issues_url"] | 75 | + url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"] |
| 76 | url.gsub(':id', issue_id.to_s) | 76 | url.gsub(':id', issue_id.to_s) |
| 77 | .gsub(':project_id', @project.id.to_s) | 77 | .gsub(':project_id', @project.id.to_s) |
| 78 | .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) | 78 | .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) |