deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Default value for issues_tracker setting added

Browse source
This commit is contained in:
Andrew8xx8 2013-02-14 18:26:50 +04:00
parent 9b606ede00
commit c643b50dbd
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -96,7 +96,7 @@ class Project < ActiveRecord::Base
scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) } scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
scope :public_only, -> { where(public: true) } scope :public_only, -> { where(public: true) }
enumerize :issues_tracker, :in => (Settings[:issues_tracker].keys).append(:gitlab), :default => :gitlab enumerize :issues_tracker, :in => (Gitlab.config.issues_tracker.keys).append(:gitlab), :default => :gitlab
class << self class << self
def abandoned def abandoned

5
config/gitlab.yml.example
View file

@ -143,7 +143,10 @@ development:
<<: *defaults <<: *defaults
test: test:
<<: *base <<: *defaults
issues_tracker:
redmine:
issues_url: "http://redmine/:project_id/:issues_tracker_id/:id"
staging: staging:
<<: *defaults <<: *defaults

2
config/initializers/1_settings.rb
View file

@ -42,6 +42,8 @@ Settings['omniauth'] ||= Settingslogic.new({})
Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil? Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil?
Settings.omniauth['providers'] ||= [] Settings.omniauth['providers'] ||= []
Settings['issues_tracker'] ||= {}
# #
# GitLab # GitLab
# #

3
spec/helpers/issues_helper_spec.rb
View file

@ -25,7 +25,7 @@ describe IssuesHelper do
describe :url_for_issue do describe :url_for_issue do
let(:issue_id) { 3 } let(:issue_id) { 3 }
let(:issues_url) { "http://redmine/:project_id/:issues_tracker_id/:id" } let(:issues_url) { Gitlab.config.issues_tracker.redmine.issues_url}
let(:ext_expected) do let(:ext_expected) do
issues_url.gsub(':id', issue_id.to_s) issues_url.gsub(':id', issue_id.to_s)
.gsub(':project_id', ext_project.id.to_s) .gsub(':project_id', ext_project.id.to_s)
@ -40,7 +40,6 @@ describe IssuesHelper do
it "should return path to external tracker" do it "should return path to external tracker" do
@project = ext_project @project = ext_project
Settings[:issues_tracker][ext_project.issues_tracker]["issues_url"] = issues_url
url_for_issue(issue_id).should match(ext_expected) url_for_issue(issue_id).should match(ext_expected)
end end