diff options
| author | John Gallagher <john@synapticmishap.co.uk> | 2012-10-27 21:55:56 +0100 |
|---|---|---|
| committer | John Gallagher <john@synapticmishap.co.uk> | 2012-10-27 21:55:56 +0100 |
| commit | 4edea9e82087f5a331a277ee4bf7b01256d11be0 (patch) | |
| tree | 58164e6aa6ac19a644e590dc35d3ab98fc5a42ef /actionpack/lib/action_controller/metal/conditional_get.rb | |
| parent | c570ba70fe6ed53fd1ac5f30f0c9ba4cb7cd4796 (diff) | |
| parent | 62f273b6501db72e3c902d947e6828dcab9c004a (diff) | |
| download | rails-4edea9e82087f5a331a277ee4bf7b01256d11be0.tar.gz rails-4edea9e82087f5a331a277ee4bf7b01256d11be0.tar.bz2 rails-4edea9e82087f5a331a277ee4bf7b01256d11be0.zip | |
Merge branch 'master' of https://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/metal/conditional_get.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index 3f37a6a618..426adfe675 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -64,7 +64,7 @@ module ActionController # # def show # @article = Article.find(params[:id]) - # fresh_when(@article, :public => true) + # fresh_when(@article, public: true) # end def fresh_when(record_or_options, additional_options = {}) if record_or_options.is_a? Hash |