summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-18 15:14:38 +0100
committerspag <spag@golwen.net>2013-01-18 15:14:38 +0100
commit9e15bf3431b4a622213365eed47b21d0f2bcae52 (patch)
tree165f41581b3a5bb7ad57ef7c087977158c4f6fe1 /app
parent8c2ffa8f9308235e151ae8f16393ee10b08b07c1 (diff)
parentfa4ff4d2e603dae76ac033a16a524e5378d3d48f (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app')
-rw-r--r--app/controllers/gs_parameters_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/gs_parameters_controller.rb b/app/controllers/gs_parameters_controller.rb
index 7ca4e8e..bd8b44b 100644
--- a/app/controllers/gs_parameters_controller.rb
+++ b/app/controllers/gs_parameters_controller.rb
@@ -1,5 +1,5 @@
class GsParametersController < ApplicationController
- load_resource :gs_parameter
+ load_and_authorize_resource :gs_parameter
before_filter :spread_breadcrumbs