Skip to content

Jrjackson #110

Closed
wants to merge 20 commits into from

5 participants

@guyboertje

Lets try again :-)

rwz and others added some commits Feb 17, 2013
@rwz rwz Added load_options/dump_options to MultiJson e02798b
@rwz rwz Added load_options/dump_options to adapters as well 8ae00d7
@rwz rwz Using load_options/dump_options for passing options to adapter instance
Deprecated MultiJson.default_options
706b42b
@rwz rwz Cleaned Oj and JsonCommon adapter using new Adapter.defaults API 1655c20
@sferik sferik Merge pull request #91 from intridea/default-options
Default options
8f3b7b6
@rwz rwz Removed unused code from specs 9842c37
@rwz rwz MultiJson does not modify arguments
Related to #92
bc8424c
@karlfreeman karlfreeman Outdated documentation 86e82cc
@sferik sferik Merge pull request #93 from karlfreeman/master
Outdated documentation
b0641b5
@sferik sferik Add Coveralls for code coverage reporting df7542f
@rwz rwz Cleaned up some specs 3196081
@guyboertje guyboertje tidy up 9022374
@guyboertje guyboertje Merge branch 'master' of git://github.com/intridea/multi_json
Conflicts:
	lib/multi_json.rb
	lib/multi_json/adapter.rb
	lib/multi_json/adapters/json_common.rb
	lib/multi_json/adapters/oj.rb
	spec/adapter_shared_example.rb
	spec/json_common_shared_example.rb
	spec/multi_json_spec.rb
0ff5dad
@guyboertje guyboertje Merge branch 'master' into jrjackson
Conflicts:
	Gemfile
	lib/multi_json.rb
	lib/multi_json/adapters/jr_jackson.rb
	spec/adapter_shared_example.rb
	spec/multi_json_spec.rb
8247aeb
@guyboertje guyboertje rename jrjackson 9dfe8c7
@guyboertje guyboertje change Gemfile to point to gem 0.1.0 09ddeda
@guyboertje guyboertje now for the proper gem line 2943345
@guyboertje guyboertje fix ws 5aeee95
@guyboertje guyboertje use jrjackson 0.1.1 with regex change for 1.8 and 1.9 time string df69d3c
@guyboertje guyboertje Merge branch 'master' of git://github.com/intridea/multi_json 03453cb
@rwz
INTRIDEA Inc. member
rwz commented Apr 16, 2013

omg, could you please rebase against current master? This pull-request contains too much unrelated commits that are already in master.

@coveralls

Coverage increased (+6.2%) when pulling 03453cb on guyboertje:jrjackson into 49047a8 on intridea:master.

View Details

@sferik
INTRIDEA Inc. member
sferik commented Apr 16, 2013

I rebased and merged manually.

@rwz I think this problem occurred when you did the major rebase of master before the last release.

@sferik sferik closed this Apr 16, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.