aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7282 from xHire/validates_length_of_fixRafael Mendonça França2012-11-263-2/+57
|\
| * Length validation handles correctly nil. Fix #7180Michal Zima2012-11-263-2/+57
* | Merge pull request #8324 from steveklabnik/changelog_7997Rafael Mendonça França2012-11-261-1/+1
|\ \
| * | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
* | | Merge pull request #8323 from steveklabnik/changelog_7997Rafael Mendonça França2012-11-261-0/+2
|\| |
| * | Add changelog for #7997.Steve Klabnik2012-11-261-0/+2
|/ /
* | Merge pull request #8319 from alindeman/typoCarlos Antonio da Silva2012-11-261-1/+1
|\ \
| * | Corrects typo in test nameAndy Lindeman2012-11-261-1/+1
* | | Merge pull request #8320 from senny/active_model_log_folderCarlos Antonio da Silva2012-11-261-0/+1
|\ \ \
| * | | log output from activemodel's railtie_test directly to STDOUTYves Senn2012-11-261-0/+1
| | |/ | |/|
* | | Merge pull request #6197 from blakesmith/connection_adapters_without_explain_...Xavier Noria2012-11-263-6/+24
|\ \ \ | |_|/ |/| |
| * | Don't run explain on slow queries for database adapters that don't support itBlake Smith2012-11-263-6/+24
|/ /
* | Merge pull request #8312 from senny/make_active_model_parts_individually_load...Rafael Mendonça França2012-11-269-21/+14
|\ \
| * | cleanup, removed dispensable `require` statements from `ActiveModel`Yves Senn2012-11-258-12/+5
| * | cleanup, remove broken whitespaceYves Senn2012-11-254-9/+9
* | | Improve clarity of routing testsAndrew White2012-11-261-634/+1081
* | | Require active_model/railtie directly instead of rails/allCarlos Antonio da Silva2012-11-261-3/+3
| |/ |/|
* | Merge pull request #8316 from roberto/assert_template_validate_optionsCarlos Antonio da Silva2012-11-263-1/+11
|\ \
| * | assert_template: validating option keysRoberto Soares2012-11-253-1/+11
* | | Merge pull request #8317 from latortuga/cache-digest-opt-outDavid Heinemeier Hansson2012-11-263-1/+38
|\ \ \
| * | | Add explicit opt-out for fragment cache digestingDrew Ulmer2012-11-253-1/+38
* | | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-252-2/+12
* | | | speed up fixture loading by querying the schema cache for column namesAaron Patterson2012-11-252-2/+11
| |/ / |/| |
* | | Merge pull request #8302 from roberto/assert_template_empty_stringCarlos Antonio da Silva2012-11-253-1/+19
|\ \ \ | |/ / |/| |
| * | `assert_template` fails with empty string.Roberto Soares2012-11-233-9/+12
| * | `assert_template` fails with empty string when a template has been renderedRoberto Soares2012-11-233-4/+19
* | | Merge pull request #8311 from alisdair/dirty-nullable-datetimeCarlos Antonio da Silva2012-11-253-0/+21
|\ \ \ | |_|/ |/| |
| * | Don't call will_change! for datetime nil->"".Alisdair McDiarmid2012-11-253-0/+21
|/ /
* | Merge pull request #8306 from senny/documentation_for_hidden_field_idCarlos Antonio da Silva2012-11-241-0/+5
|\ \
| * | document :hidden_field_id option for fields_forYves Senn2012-11-241-0/+5
* | | Fix changelog entry about fast_string_to_time fixCarlos Antonio da Silva2012-11-241-2/+2
* | | Refector a bit to remove extra slice iteration and splat callCarlos Antonio da Silva2012-11-241-2/+2
* | | Use merge! in some places to avoid creating extra hashesCarlos Antonio da Silva2012-11-242-4/+4
* | | Simplify scope options recovery by using merge!Carlos Antonio da Silva2012-11-241-6/+1
* | | Normalize scope recovering :blocks option nameCarlos Antonio da Silva2012-11-241-3/+3
* | | Simplify constraints condition in scope when checking for HashCarlos Antonio da Silva2012-11-241-7/+4
* | | Move initialize_copy method around to let new method / build alias closerCarlos Antonio da Silva2012-11-241-8/+8
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-233-4/+4
|\ \
| * | fixed a minor spelling errorLennart Tange2012-11-201-1/+1
| * | embed code example using backticks in caching guideSergey Nartimov2012-11-201-2/+2
| * | remove previous commitMichel Grootjans2012-11-201-1/+1
| * | bug in example '<%= form_for ...' should be '<% form_for ...'Michel Grootjans2012-11-201-1/+1
| * | Fix broken link in Active Record Query Interface guideJaime Iniesta2012-11-181-1/+1
* | | Merge pull request #8291 from senny/8265_build_with_polymorphic_associationRafael Mendonça França2012-11-223-1/+15
|\ \ \
| * | | prevent mass assignment of polymorphic type when using `build`Yves Senn2012-11-223-1/+15
* | | | Indent changelog markdown code to highlight correctlyCarlos Antonio da Silva2012-11-221-11/+11
* | | | Merge pull request #8114 from guilleiguaran/use-symbols-in-scopeAndrew White2012-11-223-1/+43
|\ \ \ \
| * | | | Allow setting a symbol as path in scope on routesGuillermo Iguaran2012-11-213-1/+43
|/ / / /
* | | | Remove private partial/template renderer methodsCarlos Antonio da Silva2012-11-213-14/+3
* | | | Merge branch 'deprecate-calculations-with-block'Carlos Antonio da Silva2012-11-216-49/+25
|\ \ \ \