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: reactjs/react-rails
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: reactjs/react-rails
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.12
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 10 files changed
  • 5 contributors

Commits on Jul 25, 2014

  1. v0.11.1.0, using React v0.11.1 

    I'm skipping React v0.11.0 since it included several bugs. We didn't
ship react-rails right away, so it should be find to skip.
    @zpao
    zpao committed Jul 25, 2014
    Configuration menu
    Copy the full SHA
    e1d3ee1 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2014

  1. Point to 0.11 in README on 0.11 branch

    @glittershark
    glittershark committed Aug 18, 2014
    Configuration menu
    Copy the full SHA
    f89c769 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2014

  1. Merge pull request #78 from glittershark/0.11 

    Point to 0.11 in README on 0.11 branch
    @zpao
    zpao committed Sep 7, 2014
    Configuration menu
    Copy the full SHA
    7bde653 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2014

  1. update readme with latest gem version, fixes #86

    William Meleyal committed Sep 9, 2014
    Configuration menu
    Copy the full SHA
    ad54110 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #88 from meleyal/0.11 

    update readme with latest gem version, fixes #86
    @zpao
    zpao committed Sep 9, 2014
    Configuration menu
    Copy the full SHA
    81b9a10 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2014

  1. update to react-source 0.12 final 

    (cherry picked from commit 2ebce56)

Conflicts:
	react-rails.gemspec
    @grahamcracker @zpao
    grahamcracker authored and zpao committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    25b9897 View commit details
    Browse the repository at this point in the history

  2. update docs and test examples for changes in 0.12 

    (cherry picked from commit 4e81aff)

Conflicts:
	README.md
	test/dummy/app/assets/javascripts/components/Todo.js.jsx.coffee
	test/dummy/app/assets/javascripts/components/TodoList.js.jsx
	test/dummy/app/assets/javascripts/example3.js.jsx
	test/helper_files/TodoListWithUpdates.js.jsx
	test/jsxtransform_test.rb
	test/react_renderer_test.rb
    @grahamcracker @zpao
    grahamcracker authored and zpao committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    90bb980 View commit details
    Browse the repository at this point in the history

  3. fix deprecated calls and provide expected messages for 0.12 

    (cherry picked from commit 359cfbb)

Conflicts:
	gemfiles/rails_4.1.gemfile
	lib/assets/javascripts/react_ujs.js
	lib/react/renderer.rb
	test/react_renderer_test.rb
    @grahamcracker @zpao
    grahamcracker authored and zpao committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    b7ba3b6 View commit details
    Browse the repository at this point in the history

  4. Update README for 0.12 branch

    @zpao
    zpao committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    3ecc42b View commit details
    Browse the repository at this point in the history

  5. Bump version for 0.12.0.0

    @zpao
    zpao committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    a50fc70 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. Use react-source@0.12.1

    @zpao
    zpao committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    96b98eb View commit details
    Browse the repository at this point in the history

  2. v0.12.1.0

    @zpao
    zpao committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    a3b4ddc View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2015

  1. upgrade react-source to 0.12.2

    Jordan Stephens committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    e9ac34c View commit details
    Browse the repository at this point in the history

  2. expect double-quoted displayName in transformed JSX after facebook/re… 

    …act@eddbb0c
    Jordan Stephens committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    a80d917 View commit details
    Browse the repository at this point in the history

  3. use full path in integration tests 

    looks like this is required after updating to actionpack 4.2.0

See change made in this commit:
rails/rails@4fd144d?diff=unified#diff-82ecef623242ece0e7d717577485d988L303
    Jordan Stephens committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    4adbe40 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2015

  1. Merge pull request #140 from jordanstephens/0.12 

    Upgrade react-source to 0.12.2
    @zpao
    zpao committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    be10965 View commit details
    Browse the repository at this point in the history

  2. v0.12.2.0

    @zpao
    zpao committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    f5a0981 View commit details
    Browse the repository at this point in the history
Loading