Skip to content

Commit

Permalink
Settings replaced by Gitlab.config
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew8xx8 committed Mar 26, 2013
1 parent 242f6aa commit 5e6f45b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/helpers/issues_helper.rb
Expand Up @@ -48,7 +48,7 @@ def url_for_project_issues
if @project.used_default_issues_tracker? if @project.used_default_issues_tracker?
project_issues_filter_path(@project) project_issues_filter_path(@project)
else else
url = Settings[:issues_tracker][@project.issues_tracker]["project_url"] url = Gitlab.config.issues_tracker[@project.issues_tracker]["project_url"]
url.gsub(':project_id', @project.id.to_s) url.gsub(':project_id', @project.id.to_s)
.gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s)
end end
Expand All @@ -60,7 +60,7 @@ def url_for_new_issue
if @project.used_default_issues_tracker? if @project.used_default_issues_tracker?
url = new_project_issue_path project_id: @project url = new_project_issue_path project_id: @project
else else
url = Settings[:issues_tracker][@project.issues_tracker]["new_issue_url"] url = Gitlab.config.issues_tracker[@project.issues_tracker]["new_issue_url"]
url.gsub(':project_id', @project.id.to_s) url.gsub(':project_id', @project.id.to_s)
.gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s)
end end
Expand All @@ -72,7 +72,7 @@ def url_for_issue(issue_id)
if @project.used_default_issues_tracker? if @project.used_default_issues_tracker?
url = project_issue_url project_id: @project, id: issue_id url = project_issue_url project_id: @project, id: issue_id
else else
url = Settings[:issues_tracker][@project.issues_tracker]["issues_url"] url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"]
url.gsub(':id', issue_id.to_s) url.gsub(':id', issue_id.to_s)
.gsub(':project_id', @project.id.to_s) .gsub(':project_id', @project.id.to_s)
.gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s)
Expand Down

0 comments on commit 5e6f45b

Please sign in to comment.