diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
| commit | a4927fc05a710cee6217d8a40ce925d5f894fd8f (patch) | |
| tree | 83909e1d903afbf49d50182af79a679442632975 /app/models/censor_rule.rb | |
| parent | cc27fe66a13fe1504711c64ce5530a1c178e907d (diff) | |
| parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) | |
Merge branch 'release/0.6.7' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/models/censor_rule.rb')
| -rw-r--r-- | app/models/censor_rule.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb index da3f49760..f40ab6fbb 100644 --- a/app/models/censor_rule.rb +++ b/app/models/censor_rule.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 114 +# Schema version: 20120919140404 # # Table name: censor_rules # @@ -9,11 +9,11 @@ # public_body_id :integer # text :text not null # replacement :text not null -# regexp :boolean # last_edit_editor :string(255) not null # last_edit_comment :text not null # created_at :datetime not null # updated_at :datetime not null +# regexp :boolean # # models/censor_rule.rb: @@ -21,8 +21,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: censor_rule.rb,v 1.14 2009-09-17 21:10:04 francis Exp $ class CensorRule < ActiveRecord::Base belongs_to :info_request |