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: rails/rails
base: abad4f704904
Choose a base ref
...
head repository: rails/rails
compare: 98b52826fe0d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 2, 2013

  1. Revert "Use jquery-rails from github (fix Gem::Version error)" 

    This reverts commit 6f3f0f8.
    @spastorino
    spastorino committed Apr 2, 2013
    Copy the full SHA
    3b6f611 View commit details
    Browse the repository at this point in the history

  2. Revert "Use jquery-rails from github" 

    This reverts commit 7a9a700.

Conflicts:
	railties/lib/rails/generators/app_base.rb
    @spastorino
    spastorino committed Apr 2, 2013
    Copy the full SHA
    98b5282 View commit details
    Browse the repository at this point in the history