aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #6910 from mulder/fix_path_globJosé Valim2012-07-012-1/+9
|\ \ \
| * | | Persist glob when replacing a pathNicholas Mulder2012-06-302-1/+9
* | | | Make Time#change work with offsets other than UTC or localAndrew White2012-07-013-10/+48
* | | | Remove rescue clause from ActiveSupport::TimeZone#to_fAndrew White2012-07-011-2/+1
* | | | Remove DateTime#to_time overrideAndrew White2012-07-011-14/+0
* | | | Use strftime to convert DateTime to numericAndrew White2012-07-011-2/+1
* | | | Update AR and AP changelogs [ci skip]Carlos Antonio da Silva2012-06-302-1/+15
* | | | Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-apCarlos Antonio da Silva2012-06-305-24/+33
|\ \ \ \
| * | | | Remove ActiveModel dependency from ActionPackGuillermo Iguaran2012-06-305-24/+33
* | | | | Merge pull request #6913 from lexmag/column_exists_optionsCarlos Antonio da Silva2012-06-302-10/+18
|\ \ \ \ \
| * | | | | Add more options to column_exists? methodAleksey Magusev2012-06-302-10/+18
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-3013-137/+385
|\ \ \ \ \
| * | | | | Remove mention of `convert_key` now that it's been taken out in 1eecd9483b043...Alex Nisnevich2012-06-281-7/+0
| * | | | | Rails now uses the ActiveSupport BufferedLogger classChris Adams2012-06-291-1/+1
| * | | | | update AR::FinderMethods#exists?(false) example [ci skip]Francesco Rodriguez2012-06-281-5/+7
| * | | | | Mention effect of accepts_nested_attributes_for on association autosave optio...Chris Gunther2012-06-271-0/+8
| * | | | | corrected URLs and controller benchmark method callEric Carty-Fickes2012-06-261-3/+3
| * | | | | update ActiveModel::Name documentation [ci skip]Francesco Rodriguez2012-06-251-1/+133
| * | | | | fix punctuation in activemodel/errors [ci skip]Francesco Rodriguez2012-06-251-1/+1
| * | | | | Fixed example in 1.2 so help will be defined as the text impliesPerry Smith2012-06-241-1/+7
| * | | | | update ActiveModel::Naming documentationFrancesco Rodriguez2012-06-231-7/+8
| * | | | | Merge pull request #104 from udaykadaboina/typofixFrancesco Rodríguez2012-06-231-2/+2
| |\ \ \ \ \
| | * | | | | fixed another typo in edge guidesUday Kadaboina2012-06-231-1/+1
| | * | | | | fixed a typoUday Kadaboina2012-06-231-1/+1
| * | | | | | update ActiveModel::Model documentation [ci skip]Francesco Rodriguez2012-06-231-16/+37
| * | | | | | add description ActiveModel::StrictValidationField [ci skip]Francesco Rodriguez2012-06-231-0/+10
| |/ / / / /
| * | | | | update ActiveModel::Lint documentation [ci skip]Francesco Rodriguez2012-06-221-22/+23
| * | | | | update ActiveModel::Errors#include? documentation [ci skip]Francesco Rodriguez2012-06-221-1/+1
| * | | | | add documentation and examples to ActiveModel::Errors [ci skip]Francesco Rodriguez2012-06-221-4/+26
| * | | | | update ActiveModel::Errors documentation and minor fixes [ci skip]Francesco Rodriguez2012-06-223-64/+103
| * | | | | update ActiveModel::Conversion documentation [ci skip]Francesco Rodriguez2012-06-221-8/+21
* | | | | | Fix collation database task to use begin..rescue..endCarlos Antonio da Silva2012-06-301-4/+6
* | | | | | Merge pull request #6908 from apotonick/av-prepare2José Valim2012-06-302-20/+13
|\ \ \ \ \ \
| * | | | | | removing the AV::Base.helpers class attribute as it is not needed.Nick Sutterer2012-06-291-1/+0
| * | | | | | remove AV.prepare and move all helper-related logic into the controller. this...Nick Sutterer2012-06-292-19/+13
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6906 from kennyj/extract_collationRafael Mendonça França2012-06-308-8/+88
|\ \ \ \ \ \
| * | | | | | Extract collation tasks to database tasks.kennyj2012-07-018-8/+88
* | | | | | | Merge pull request #6869 from bcardarella/active_relation_inspectJon Leighton2012-06-303-5/+5
|\| | | | | |
| * | | | | | Remove ActiveRelation#inspectBrian Cardarella2012-06-293-5/+5
|/ / / / / /
* | | | | | make sure the inflection rules are loaded when cherry-picking active_support/...Xavier Noria2012-06-293-0/+5
* | | | | | Fix failing test in file update checkerCarlos Antonio da Silva2012-06-291-2/+3
* | | | | | Remove another missing test related to draw external routesCarlos Antonio da Silva2012-06-291-10/+0
* | | | | | Remove more tests related to draw external routes filesRafael Mendonça França2012-06-294-53/+1
* | | | | | Merge pull request #6911 from abonec/masterJosé Valim2012-06-292-1/+17
|\ \ \ \ \ \
| * | | | | | fix FileUpdateChecker when file has wrong mtime (from future)abonec2012-06-292-1/+17
| | |_|_|/ / | |/| | | |
* | | | | | Revert "Allow loading external route files from the router"José Valim2012-06-2910-149/+6
* | | | | | Remove unused responsibilities and add a few load definitions to enginesJosé Valim2012-06-295-148/+141
|/ / / / /
* | | | | Remove unnecessary Railties structure now that plugins are goneJosé Valim2012-06-295-121/+85
* | | | | Depend on thor 0.15.4José Valim2012-06-291-1/+1
* | | | | Rename RouteInspect to RoutesInspector for consistencyJosé Valim2012-06-294-7/+7