aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1315 from ardavis/masterJosé Valim2011-05-252-2/+2
|\
| * Added a space to the comment_if helper for formatting purposesAndrew Davis2011-05-251-1/+1
| * Accidentally added extra IDE files, removed them.Andrew Davis2011-05-258-342/+0
| * Removed unnecessary space in application.rb for formattingAndrew Davis2011-05-259-1/+343
* | Merge pull request #1316 from guilleiguaran/railties-changelogAaron Patterson2011-05-251-0/+7
|\ \ | |/ |/|
| * Updating Railties changelogGuillermo Iguaran2011-05-251-0/+7
|/
* Merge pull request #1312 from joshk/remove_active_support_deprecationsJosé Valim2011-05-2515-648/+3
|\
| * Removed deprecated methods and related tests from ActiveSupportJosh Kalderimis2011-05-2515-648/+3
|/
* Merge pull request #1311 from kuldarkrabbi/masterJosé Valim2011-05-251-1/+0
|\
| * action_view/template/handler has been removedKuldar Krabbi2011-05-251-1/+0
* | Merge branch 'master' of github.com:rails/railsXavier Noria2011-05-2512-162/+4
|\|
| * Merge pull request #1285 from joshk/remove_active_record_deprecationsAaron Patterson2011-05-2512-162/+4
| |\
| | * removed deprecated methods, and related tests, from ActiveRecordJosh Kalderimis2011-05-2512-162/+4
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2594-363/+408
|\ \ \ | |/ / |/| |
| * | Typo; changed 'Febuary' to 'February'Lee Reilly2011-05-251-1/+1
| * | Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed'Lee Reilly2011-05-251-3/+3
| * | Typo; changed 'enviroment' to 'environment'Lee Reilly2011-05-251-1/+1
| * | prefer validates :x in place of validates_x_ofVijay Dev2011-05-261-25/+25
| * | fixed minor errorsVijay Dev2011-05-261-3/+4
| * | changes validates_format & numericality to newer syntaxVijay Dev2011-05-251-6/+6
| * | changes validates_inclusion & exclusion to newer syntaxVijay Dev2011-05-251-7/+7
| * | changes validates_length_of to newer syntaxVijay Dev2011-05-251-17/+14
| * | changes validates_confirmation_of to newer syntaxVijay Dev2011-05-251-4/+4
| * | changes validates_acceptance_of to newer syntaxVijay Dev2011-05-251-2/+2
| * | changes validates_uniqueness_of to newer syntaxVijay Dev2011-05-251-4/+4
| * | changes validates_presence_of to newer syntaxVijay Dev2011-05-251-9/+8
| * | fix incorrect textile syntaxVijay Dev2011-05-251-2/+2
| * | Replace old wording about http requestsJeff Cohen2011-05-251-4/+4
| * | update language env variable nameVijay Dev2011-05-251-2/+2
| * | Adds outline draft#1 for the Asset Pipeline, please comment if you have thoug...Mohammad El-Abid2011-05-251-0/+29
| * | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme f...Karunakar (Ruby)2011-05-245-5/+5
| * | fix minor spelling mistakes in commentsDmytrii Nagirniak2011-05-231-3/+3
| * | Removed extra white-spaces on config/environment/test.rb templateGuillermo Iguaran2011-05-231-2/+2
| * | Removing extra white-spaces on config/environment/development.rb templateGuillermo Iguaran2011-05-231-1/+1
| * | Update the MVC explanation in the main README.rdoc fileJeff Cohen2011-05-231-21/+26
| * | Remove extra white spaces on ActiveSupport docs.Sebastian Martinez2011-05-238-9/+9
| * | Remove extra white spaces on ActiveRecord docs.Sebastian Martinez2011-05-2325-51/+51
| * | Remove extra white spaces on ActiveModel docs.Sebastian Martinez2011-05-2313-24/+24
| * | Remove extra white spaces on ActionMailer docs.Sebastian Martinez2011-05-231-7/+7
| * | Remove extra white spaces on ActionPack docs.Sebastian Martinez2011-05-2322-53/+53
| * | Fix styling error on plugins guide.Sebastian Martinez2011-05-231-1/+1
| * | NOTE: doesn't handle newlines.Matthew McEachen2011-05-231-3/+1
| * | active resource instalation instructions and LicenceKarunakar (Ruby)2011-05-241-1/+23
| * | rails request has been moved from Lighthouse to Github, contribution link has...JudeArasu2011-05-231-1/+2
| * | removed require_library_or_gem from the AS core extensions guideJosh Kalderimis2011-05-231-14/+0
| * | Minor typo describing engine helpersMatthew Daubert2011-05-221-2/+2
| * | Merge branch 'master' of github.com:lifo/docrailsMatthew McEachen2011-05-222-4/+6
| |\ \
| | * | has_many :dependent => :restrict raises an exception but is not documented ap...Aditya Sanghi2011-05-221-2/+4
| | * | Fixed documentation for scope with path.Anuj Dutta2011-05-221-2/+2
| * | | Following proper naming conventions while referring to Rails, BundlerMatthew McEachen2011-05-221-4/+4