Skip to content

Commit

Permalink
Merge pull request #178 from rafalchmiel/master
Browse files Browse the repository at this point in the history
Fix inconsistent quotes and refactor an if statement
  • Loading branch information
samlown committed Feb 14, 2014
2 parents f929659 + 8e54aa2 commit fc65be6
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions lib/couchrest_model.rb
@@ -1,4 +1,4 @@
require 'active_model'
require "active_model"
require "active_model/callbacks"
require "active_model/conversion"
require "active_model/errors"
Expand All @@ -9,22 +9,22 @@
require "active_model/validations"
require "active_model/dirty"

require 'active_support/core_ext'
require 'active_support/json'
require "active_support/core_ext"
require "active_support/json"

require 'mime/types'
require "mime/types"
require "enumerator"
require "time"
require 'digest/md5'
require "digest/md5"

require 'bigdecimal' # used in typecast
require 'bigdecimal/util' # used in typecast
require "bigdecimal" # used in typecast
require "bigdecimal/util" # used in typecast

require 'couchrest'
require "couchrest"

require 'couchrest/model'
require 'couchrest/model/errors'
require 'couchrest/model/translation'
require "couchrest/model"
require "couchrest/model/errors"
require "couchrest/model/translation"
require "couchrest/model/persistence"
require "couchrest/model/typecast"
require "couchrest/model/casted_by"
Expand Down Expand Up @@ -62,6 +62,4 @@
require "couchrest/model/utils/migrate.rb"

# Add rails support *after* everything has loaded
if defined?(Rails)
require "couchrest/railtie"
end
require "couchrest/railtie" if defined?(Rails)

0 comments on commit fc65be6

Please sign in to comment.