diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/event.rb | 4 | ||||
| -rw-r--r-- | app/models/note.rb | 6 | ||||
| -rw-r--r-- | app/models/project.rb | 5 |
3 files changed, 2 insertions, 13 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index cf88e9f4afc..b88635ccb59 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -286,10 +286,6 @@ class Event < ActiveRecord::Base end.to_s end - def wall_note? - target.noteable_type.blank? - end - def note_target_type if target.noteable_type.present? target.noteable_type.titleize diff --git a/app/models/note.rb b/app/models/note.rb index dc8b968c3d2..659cd752071 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -251,10 +251,6 @@ class Note < ActiveRecord::Base for_merge_request? && for_diff_line? end - def for_wall? - noteable_type.blank? - end - # override to return commits, which are not active record def noteable if for_commit? @@ -295,8 +291,6 @@ class Note < ActiveRecord::Base def noteable_type_name if noteable_type.present? noteable_type.downcase - else - "wall" end end diff --git a/app/models/project.rb b/app/models/project.rb index f92cc40642a..e251c777d89 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -31,7 +31,6 @@ class Project < ActiveRecord::Base default_value_for :archived, false default_value_for :issues_enabled, true - default_value_for :wall_enabled, true default_value_for :merge_requests_enabled, true default_value_for :wiki_enabled, true default_value_for :snippets_enabled, true @@ -39,7 +38,7 @@ class Project < ActiveRecord::Base ActsAsTaggableOn.strict_case_match = true attr_accessible :name, :path, :description, :issues_tracker, :label_list, - :issues_enabled, :wall_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, + :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :wiki_enabled, :visibility_level, :import_url, :last_activity_at, as: [:default, :admin] attr_accessible :namespace_id, :creator_id, as: :admin @@ -98,7 +97,7 @@ class Project < ActiveRecord::Base exclusion: { in: Gitlab::Blacklist.path }, format: { with: Gitlab::Regex.path_regex, message: "only letters, digits & '_' '-' '.' allowed. Letter or digit should be first" } - validates :issues_enabled, :wall_enabled, :merge_requests_enabled, + validates :issues_enabled, :merge_requests_enabled, :wiki_enabled, inclusion: { in: [true, false] } validates :issues_tracker_id, length: { maximum: 255 }, allow_blank: true validates :namespace, presence: true |