Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ruby/psych
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ruby/psych
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: atambo-native_jruby
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 11 files changed
  • 3 contributors

Commits on Jun 24, 2013

  1. Add native jruby support to psych. Fixes #145

    @atambo
    atambo committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    5fcdd11 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2013

  1. Merge branch 'master' into atambo-native_jruby 

    * master:
  backport Tempfile.create so psych tests will run outside ruby trunk
  * ext/psych/lib/psych/scalar_scanner.rb: invalid floats should be   treated as strings.   [Fixes GH-156] #156
  merge ruby/ruby@826df7f upstream
  * ext/psych/lib/psych/visitors/yaml_tree.rb: register time objects so   they are referenced as ids during output. * test/psych/test_date_time.rb: corresponding test.
  merging from ruby trunk
  Replace outdated ruby-head with 2.0.0 on travis
  updating manifest

Conflicts:
	.travis.yml
    @tenderlove
    tenderlove committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    89f0e92 View commit details
    Browse the repository at this point in the history

  2. the space is not required

    @tenderlove
    tenderlove committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    612f8d7 View commit details
    Browse the repository at this point in the history

  3. Use UnsafeHolder, since UnsafeFactory is gone in 1.7.5+.

    @headius
    headius committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    b88e676 View commit details
    Browse the repository at this point in the history

  4. Use read encoding from IO to set up parser's reader.

    @headius
    headius committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    b260422 View commit details
    Browse the repository at this point in the history

  5. Properly negotiate encoding from string or IO.

    @headius
    headius committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    ff76308 View commit details
    Browse the repository at this point in the history
Loading