summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-28 07:02:44 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-28 07:02:44 +0000
commit5ebdbfab8443707aaff8d5a006f4968bd7b7c489 (patch)
tree398f0b7178303b82b374a4220f85923e3dd240ed /app/models
parentdb80c149cf4a813fd5dfb862770c715f50930303 (diff)
parentccd617e58ea71c42b6b073e692447d0fe3c00be6 (diff)
downloadgitlab-ce-5ebdbfab8443707aaff8d5a006f4968bd7b7c489.tar.gz
Merge branch 'pg_fixes' into 'master'
Postgres fixes For applications migrated from MySQL to PostreSQL it fixes some issues Fixes #1060
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project.rb2
-rw-r--r--app/models/web_hook.rb4
2 files changed, 6 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index c3bf7a5e435..b65fda44e1e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -28,6 +28,8 @@ class Project < ActiveRecord::Base
include Gitlab::VisibilityLevel
extend Enumerize
+ default_value_for :imported, false
+
ActsAsTaggableOn.strict_case_match = true
attr_accessible :name, :path, :description, :issues_tracker, :label_list,
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index 8a5c4b6cd47..45a795391a2 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -17,6 +17,10 @@
class WebHook < ActiveRecord::Base
include HTTParty
+ default_value_for :push_events, true
+ default_value_for :issues_events, false
+ default_value_for :merge_requests_events, false
+
attr_accessible :url
# HTTParty timeout