Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix uninitialized instance variable warning #570

Merged
merged 1 commit into from Aug 2, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/active_model/array_serializer.rb
@@ -1,6 +1,5 @@
require 'active_model/default_serializer'
require 'active_model/serializable'
require 'active_model/serializer'

module ActiveModel
class ArraySerializer
Expand Down
4 changes: 2 additions & 2 deletions lib/active_model/serializer.rb
Expand Up @@ -113,8 +113,8 @@ def initialize(object, options={})
@meta_key = options[:meta_key] || :meta
@meta = options[@meta_key]
@wrap_in_array = options[:_wrap_in_array]
@only = Array(options[:only]) if options[:only]
@except = Array(options[:except]) if options[:except]
@only = options[:only] ? Array(options[:only]) : nil
@except = options[:except] ? Array(options[:except]) : nil
@key_format = options[:key_format]
end
attr_accessor :object, :scope, :root, :meta_key, :meta, :key_format
Expand Down
1 change: 0 additions & 1 deletion lib/active_model/serializer/associations.rb
@@ -1,5 +1,4 @@
require 'active_model/default_serializer'
require 'active_model/serializer'

module ActiveModel
class Serializer
Expand Down