Skip to content

Commit

Permalink
Merge pull request #1154 from NullVoxPopuli/rubocop-fixes
Browse files Browse the repository at this point in the history
Rubocop fixes for issues introduced by #1089
  • Loading branch information
joaomdmoura committed Sep 15, 2015
2 parents 1bff617 + a34cb99 commit 0c42e32
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/active_model_serializers.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require 'logger'
require 'active_model'
require "active_support/railtie"
require 'active_support/railtie'
require 'action_controller'
require "action_controller/railtie"
require 'action_controller/railtie'
module ActiveModelSerializers
mattr_accessor :logger
self.logger = Rails.logger || Logger.new(IO::NULL)
Expand Down
1 change: 0 additions & 1 deletion test/logger_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require 'test_helper'

class ActiveModelSerializers::LoggerTest < Minitest::Test

def test_logger_is_set_to_action_controller_logger_when_initializer_runs
assert_equal ActiveModelSerializers.logger, ActionController::Base.logger
end
Expand Down

0 comments on commit 0c42e32

Please sign in to comment.