diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-17 17:39:51 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-17 17:39:51 +0100 |
| commit | 6fbcb461025dc315d688038d9f0a8e138d00ba33 (patch) | |
| tree | 628ad3d7bf9cb2310bc2bed2e94b8670532a0dd4 /app/models/user_info_request_sent_alert.rb | |
| parent | abde5e4a1139c41c6db23ce041fba090674f65ac (diff) | |
| parent | f41ec6d1cb167058a808b7820da5345c6da962fd (diff) | |
Merge branch 'feature/hide-individual-responses' into rails-3-develop
Conflicts:
Gemfile
app/views/admin_request/edit_outgoing.html.erb
config/packages
doc/CHANGES.md
doc/INSTALL.md
spec/models/info_request_spec.rb
spec/models/public_body_spec.rb
Diffstat (limited to 'app/models/user_info_request_sent_alert.rb')
| -rw-r--r-- | app/models/user_info_request_sent_alert.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/models/user_info_request_sent_alert.rb b/app/models/user_info_request_sent_alert.rb index 449a4c237..098b773f8 100644 --- a/app/models/user_info_request_sent_alert.rb +++ b/app/models/user_info_request_sent_alert.rb @@ -1,12 +1,11 @@ # == Schema Information -# Schema version: 114 # # Table name: user_info_request_sent_alerts # -# id :integer not null, primary key -# user_id :integer not null -# info_request_id :integer not null -# alert_type :string(255) not null +# id :integer not null, primary key +# user_id :integer not null +# info_request_id :integer not null +# alert_type :string(255) not null # info_request_event_id :integer # |