aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Remove the #sum method from CollectionAssociationCarlos Antonio da Silva2012-11-211-9/+0
| * | | | Deprecate Relation#sum with a block.Carlos Antonio da Silva2012-11-215-3/+22
| * | | | Revert "Yield only one argument instead of splatting."Carlos Antonio da Silva2012-11-213-37/+3
|/ / / /
* | | | Don't allocate new strings in compiled attribute methodsJon Leighton2012-11-213-21/+38
* | | | Move migration test together with other join table testsCarlos Antonio da Silva2012-11-212-7/+6
* | | | Use secure password min cost option in its own tests for a speed upCarlos Antonio da Silva2012-11-211-2/+10
|/ / /
* | | Merge pull request #8183 from jcoglan/objectless_sessionsJon Leighton2012-11-213-11/+47
|\ \ \
| * | | Store FlashHashes in the session as plain hashes rather than custom objects w...James Coglan2012-11-093-11/+47
* | | | Merge pull request #7716 from steveklabnik/issue_7715Rafael Mendonça França2012-11-212-1/+8
|\ \ \ \
| * | | | Coerce strings in create_join_table.Steve Klabnik2012-11-212-1/+8
* | | | | Merge pull request #8290 from cpatuzzo/masterCarlos Antonio da Silva2012-11-211-1/+1
|\ \ \ \ \
| * | | | | TypoChris Patuzzo2012-11-211-1/+1
|/ / / / /
* | | | | Merge pull request #6245 from bogdan/bc_timestampRafael Mendonça França2012-11-214-3/+24
|\ \ \ \ \
| * | | | | Fix postgresql adapter to handle bc timestamps correctlyBogdan Gusiev2012-11-214-3/+24
* | | | | | Merge pull request #8289 from semaperepelitsa/pg_adapter_refactoring_squashedRafael Mendonça França2012-11-212-13/+39
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Refactoring, testing and documenting pg_connection.distinctSemyon Perepelitsa2012-11-212-13/+39
|/ / / / /
* | | | | Remove return guard and use code convetionsRafael Mendonça França2012-11-201-7/+11
* | | | | Merge pull request #8280 from asanghi/fix_guide_field_with_error_procRafael Mendonça França2012-11-201-2/+6
|\ \ \ \ \
| * | | | | fix guide with field_with_error proc exampleAditya Sanghi2012-11-201-2/+6
* | | | | | Merge pull request #8282 from arunagw/warning_removed_for_ruby2Carlos Antonio da Silva2012-11-201-0/+2
|\ \ \ \ \ \
| * | | | | | Initialize accessors to remove some warnings in Ruby 2.0Arun Agrawal2012-11-211-0/+2
|/ / / / / /
* | | | | | Merge pull request #8276 from pwnall/pgsql_text_limitsRafael Mendonça França2012-11-204-0/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Postgresql doesn't accepts limits on text columns.Victor Costan2012-11-204-0/+35
|/ / / / /