diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 12:55:09 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 12:55:09 +0100 |
| commit | 23816aff9e970e1264b2231757702f648f05e30c (patch) | |
| tree | a286daaa01c1ca2bb5f8ca7035d3370541148f43 /app/controllers/admin_censor_rule_controller.rb | |
| parent | 8c5a6f4dc2d174ed5190719d952b39720d3bf362 (diff) | |
| parent | 5097146ff016b2aaa9d3dc29f3ec65db0aadbb72 (diff) | |
Merge branch 'develop' into feature/follow-buttons
Conflicts:
app/models/track_mailer.rb
app/models/track_thing.rb
Diffstat (limited to 'app/controllers/admin_censor_rule_controller.rb')
| -rw-r--r-- | app/controllers/admin_censor_rule_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index 2c0c7ca4e..52df8dfc1 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -65,7 +65,7 @@ class AdminCensorRuleController < AdminController render :action => 'edit' end end - + def destroy censor_rule = CensorRule.find(params[:censor_rule_id]) info_request = censor_rule.info_request |