Cleanup backported from rails4 branch #2035
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
June 3, 2014 10:02
This way the environment can decide which interpreter got to be used. It's absolutly usefull if we try out other ruby versions or to use another path for the ruby binary.
As the i18n content is now always stored within the localization files we don't need the locale_additions anymore. And of course we don't need this extraction methods either.
|
@dirkmueller better commit messages? :) |
| secondaries[primary[:id]].each do |secondary| | ||
| out.puts " secondary.item :#{secondary[:id]}, t(\"nav.#{secondary[:id]}\"), #{secondary[:link]}" | ||
| end | ||
| end |
|
I agree with Dirk that the commit message is a bit confusing (maybe change it to "Use correct command line instead of shortcut that will be dropped"), but other than that, +1. |
added 3 commits
June 25, 2014 10:03
Use the correct command line instead a shortcut that will be removed in a future version within another commit
|
Updated the commit message |
vuntz
added a commit
that referenced
this pull request
Jun 30, 2014
Cleanup backported from rails4 branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Look at the commit messages. It is a backport of the delayed pull request: #2029