diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-22 18:12:21 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-22 18:12:21 +0100 |
| commit | 47e617e0fd4562aa19e7862f66600ad4098222c4 (patch) | |
| tree | 302216a6cf7206a763e629baed68900cd908c91e /app/controllers/admin_censor_rule_controller.rb | |
| parent | 1374da2477cf96eb3d751c1909bbc7b77e7dc0e2 (diff) | |
| parent | bc73110b230e607d4d7e5acae467790845784704 (diff) | |
Merge branch 'release/0.6.3' into develop
Conflicts:
app/controllers/admin_public_body_controller.rb
app/views/admin_public_body/import_csv.rhtml
spec/controllers/admin_public_body_controller_spec.rb
spec/models/info_request_spec.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, 0 insertions, 2 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index ec86cdf8e..52df8dfc1 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -31,8 +31,6 @@ class AdminCensorRuleController < AdminController redirect_to admin_url('request/show/' + @censor_rule.info_request.id.to_s) elsif !@censor_rule.user.nil? redirect_to admin_url('user/show/' + @censor_rule.user.id.to_s) - elsif @censor_rule.regexp? - redirect_to admin_url('') else raise "internal error" end |