Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GH #4749. Remove branch options, because edge is not 3-2-stable. #4815

Merged
merged 1 commit into from
Feb 1, 2012

Conversation

kennyj
Copy link
Contributor

@kennyj kennyj commented Feb 1, 2012

In 3-2-stable, when we run rails new app --edge, we see the following lines in Gemfile.

  gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git', :branch => '3-2-stable'
  gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git', :branch => '3-2-stable'

I think that this is a problem.

Bundler could not find compatible versions for gem "railties":
  In Gemfile:
    sass-rails (>= 0) ruby depends on
      railties (~> 3.2.0) ruby

    rails (>= 0) ruby depends on
      railties (4.0.0.beta)

Please see #4749
Please see also kennyj@8bf3c6d (before rebasing)

spastorino added a commit that referenced this pull request Feb 1, 2012
Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
@spastorino spastorino merged commit 21735d2 into rails:3-2-stable Feb 1, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants