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

Update redcarpet dependency #8031

Merged
merged 1 commit into from
Oct 26, 2012

Conversation

vinnydiehl
Copy link

"> 2.2.2" from "> 2.1.1". Also removed a hash rocket in the Gemfile on
that same line, and created another that was necessary because the 1.9
syntax messed up syntax highlighters.

@steveklabnik
Copy link
Member

Why is this being bumped? What's in 2.2.2 that we need that wasn't in 2.2.1?

@vinnydiehl
Copy link
Author

It was at 2.1.1, not 2.2.1. The dependency is out of date.

@steveklabnik
Copy link
Member

Ahhhhh. Yeah. Sorry.

@@ -18,7 +18,7 @@ gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_fi

# This needs to be with require false to avoid
# it being automatically loaded by sprockets
gem 'uglifier', require: false
gem 'uglifier', :require => false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is unnecessary.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yeah, I read the diff wrong. We absolutely want the 1.9 syntax

"~> 2.2.2" from "~> 2.1.1". Also converted all hash rockets in the
Gemfile to the 1.9 syntax.
@vinnydiehl
Copy link
Author

I've set the previously modified hash back to the 1.9 syntax, and converted an additional. All hashes in the Gemfile are now 1.9 style, and the previous version number change obviously still stands.

@@ -4,7 +4,7 @@ gemspec

gem 'arel', github: 'rails/arel', branch: 'master'

gem 'mocha', '>= 0.11.2', :require => false
gem 'mocha', '>= 0.11.2', require: false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

carlosantoniodasilva added a commit that referenced this pull request Oct 26, 2012
@carlosantoniodasilva carlosantoniodasilva merged commit 91c5af4 into rails:master Oct 26, 2012
@carlosantoniodasilva
Copy link
Member

@gbchaosmaster thanks!

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

4 participants