Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1328 from flippingbits/cleanup_engine_generator | José Valim | 2011-05-26 | 3 | -3/+3 |
|\ | | | | | Cleanup engine generator | ||||
| * | Use global namespace Rails | Stefan Sprenger | 2011-05-26 | 2 | -2/+2 |
| | | |||||
| * | Use plugin name consistently | Stefan Sprenger | 2011-05-26 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1324 from dmathieu/no_error_on_invalid_format | José Valim | 2011-05-26 | 2 | -1/+7 |
|\ | | | | | Don't raise an exception if the format isn't recognized | ||||
| * | don't raise an exception if the format isn't recognized | dmathieu | 2011-05-26 | 2 | -1/+7 |
| | | | | | | | | Fixed while traveling to heuruko | ||||
* | | Merge pull request #1315 from ardavis/master | José Valim | 2011-05-25 | 2 | -2/+2 |
|\ \ | | | | | | | Removed unnecessary space in application.rb | ||||
| * | | Added a space to the comment_if helper for formatting purposes | Andrew Davis | 2011-05-25 | 1 | -1/+1 |
| | | | |||||
| * | | Accidentally added extra IDE files, removed them. | Andrew Davis | 2011-05-25 | 8 | -342/+0 |
| | | | |||||
| * | | Removed unnecessary space in application.rb for formatting | Andrew Davis | 2011-05-25 | 9 | -1/+343 |
| | | | |||||
* | | | Merge pull request #1316 from guilleiguaran/railties-changelog | Aaron Patterson | 2011-05-25 | 1 | -0/+7 |
|\ \ \ | |/ / |/| | | Updating Railties changelog | ||||
| * | | Updating Railties changelog | Guillermo Iguaran | 2011-05-25 | 1 | -0/+7 |
|/ / | |||||
* | | Merge pull request #1312 from joshk/remove_active_support_deprecations | José Valim | 2011-05-25 | 15 | -648/+3 |
|\ \ | | | | | | | Removed deprecated methods and related tests from ActiveSupport | ||||
| * | | Removed deprecated methods and related tests from ActiveSupport | Josh Kalderimis | 2011-05-25 | 15 | -648/+3 |
|/ / | |||||
* | | Merge pull request #1311 from kuldarkrabbi/master | José Valim | 2011-05-25 | 1 | -1/+0 |
|\ \ | | | | | | | action_view/template/handler.rb has been removed | ||||
| * | | action_view/template/handler has been removed | Kuldar Krabbi | 2011-05-25 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-05-25 | 12 | -162/+4 |
|\| | | |||||
| * | | Merge pull request #1285 from joshk/remove_active_record_deprecations | Aaron Patterson | 2011-05-25 | 12 | -162/+4 |
| |\ \ | | | | | | | | | removed deprecated methods, and related tests, from ActiveRecord | ||||
| | * | | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 12 | -162/+4 |
| | | | | |||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 94 | -363/+408 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| * | | | Typo; changed 'Febuary' to 'February' | Lee Reilly | 2011-05-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed' | Lee Reilly | 2011-05-25 | 1 | -3/+3 |
| | | | | |||||
| * | | | Typo; changed 'enviroment' to 'environment' | Lee Reilly | 2011-05-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | prefer validates :x in place of validates_x_of | Vijay Dev | 2011-05-26 | 1 | -25/+25 |
| | | | | |||||
| * | | | fixed minor errors | Vijay Dev | 2011-05-26 | 1 | -3/+4 |
| | | | | |||||
| * | | | changes validates_format & numericality to newer syntax | Vijay Dev | 2011-05-25 | 1 | -6/+6 |
| | | | | |||||
| * | | | changes validates_inclusion & exclusion to newer syntax | Vijay Dev | 2011-05-25 | 1 | -7/+7 |
| | | | | |||||
| * | | | changes validates_length_of to newer syntax | Vijay Dev | 2011-05-25 | 1 | -17/+14 |
| | | | | |||||
| * | | | changes validates_confirmation_of to newer syntax | Vijay Dev | 2011-05-25 | 1 | -4/+4 |
| | | | | |||||
| * | | | changes validates_acceptance_of to newer syntax | Vijay Dev | 2011-05-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | changes validates_uniqueness_of to newer syntax | Vijay Dev | 2011-05-25 | 1 | -4/+4 |
| | | | | |||||
| * | | | changes validates_presence_of to newer syntax | Vijay Dev | 2011-05-25 | 1 | -9/+8 |
| | | | | |||||
| * | | | fix incorrect textile syntax | Vijay Dev | 2011-05-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Replace old wording about http requests | Jeff Cohen | 2011-05-25 | 1 | -4/+4 |
| | | | | |||||
| * | | | update language env variable name | Vijay Dev | 2011-05-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Adds outline draft#1 for the Asset Pipeline, please comment if you have ↵ | Mohammad El-Abid | 2011-05-25 | 1 | -0/+29 |
| | | | | | | | | | | | | | | | | thoughts about it! | ||||
| * | | | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme ↵ | Karunakar (Ruby) | 2011-05-24 | 5 | -5/+5 |
| | | | | | | | | | | | | | | | | files | ||||
| * | | | fix minor spelling mistakes in comments | Dmytrii Nagirniak | 2011-05-23 | 1 | -3/+3 |
| | | | | |||||
| * | | | Removed extra white-spaces on config/environment/test.rb template | Guillermo Iguaran | 2011-05-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Removing extra white-spaces on config/environment/development.rb template | Guillermo Iguaran | 2011-05-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update the MVC explanation in the main README.rdoc file | Jeff Cohen | 2011-05-23 | 1 | -21/+26 |
| | | | | |||||
| * | | | Remove extra white spaces on ActiveSupport docs. | Sebastian Martinez | 2011-05-23 | 8 | -9/+9 |
| | | | | |||||
| * | | | Remove extra white spaces on ActiveRecord docs. | Sebastian Martinez | 2011-05-23 | 25 | -51/+51 |
| | | | | |||||
| * | | | Remove extra white spaces on ActiveModel docs. | Sebastian Martinez | 2011-05-23 | 13 | -24/+24 |
| | | | | |||||
| * | | | Remove extra white spaces on ActionMailer docs. | Sebastian Martinez | 2011-05-23 | 1 | -7/+7 |
| | | | | |||||
| * | | | Remove extra white spaces on ActionPack docs. | Sebastian Martinez | 2011-05-23 | 22 | -53/+53 |
| | | | | |||||
| * | | | Fix styling error on plugins guide. | Sebastian Martinez | 2011-05-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | NOTE: doesn't handle newlines. | Matthew McEachen | 2011-05-23 | 1 | -3/+1 |
| | | | | |||||
| * | | | active resource instalation instructions and Licence | Karunakar (Ruby) | 2011-05-24 | 1 | -1/+23 |
| | | | | |||||
| * | | | rails request has been moved from Lighthouse to Github, contribution link ↵ | JudeArasu | 2011-05-23 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | has been changed | ||||
| * | | | removed require_library_or_gem from the AS core extensions guide | Josh Kalderimis | 2011-05-23 | 1 | -14/+0 |
| | | | |