aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] fix doc typo for validates_uniqueness_ofSatoru Yamasaki2014-07-291-1/+1
* Merge pull request #16328 from noinkling/template_password_confirmation_fixYves Senn2014-07-292-1/+6
|\
| * Give password_confirmation div the "field" class in erb form templatenoinkling2014-07-291-1/+1
* | Merge pull request #16148 from rails/fix_json_autoloadGodfrey Chan2014-07-293-3/+52
|\ \
| * | Fixed a compatibility issue with the `Oj` gemGodfrey Chan2014-07-292-3/+10
| * | Added failing test case for #16131Godfrey Chan2014-07-291-0/+42
| |/
* / Raise an exception when attachments are added after `mail` was called.Yves Senn2014-07-293-1/+62
|/
* Merge pull request #15629 from akshay-vishnoi/test-to_paramRafael Mendonça França2014-07-284-66/+81
|\
| * Move to_param to to_query, also Improve testsAkshay Vishnoi2014-06-204-66/+81
* | Merge pull request #15658 from akshay-vishnoi/object-testsRafael Mendonça França2014-07-283-65/+65
|\ \
| * | Move object test files under objectAkshay Vishnoi2014-07-293-65/+65
|/ /
* | Merge pull request #16326 from itsNikolay/remove_blank_linesRafael Mendonça França2014-07-288-8/+0
|\ \
| * | remove blank lines in the start of the ActiveRecord filesPonomarev Nikolay2014-07-298-8/+0
|/ /
* | remove the mounted? methodAaron Patterson2014-07-282-6/+2
* | remove some cachingAaron Patterson2014-07-281-2/+1
* | Merge pull request #16305 from tomkadwill/documented_change_tableRafael Mendonça França2014-07-281-1/+1
|\ \
| * | Added nodoc to change_tableTom Kadwill2014-07-281-1/+1
* | | Extract the transaction class to a local variableRafael Mendonça França2014-07-281-6/+2
* | | Merge pull request #16284 from arthurnn/transactionsRafael Mendonça França2014-07-284-62/+101
|\ \ \
| * | | savepoint_name should return nil for non-savepoint transactionsArthur Neves2014-07-283-4/+27
| * | | Transactions refactoringArthur Neves2014-07-283-38/+65
| * | | Remove finishing? method from transaction.Arthur Neves2014-07-242-24/+13
* | | | Fix typo and remove code block since present is not a method.Rafael Mendonça França2014-07-281-1/+1
* | | | docs, clarify attribute query methods on numeric columns. Closes #16246.Yves Senn2014-07-281-0/+1
* | | | Merge pull request #16303 from rajcybage/removing_masterYves Senn2014-07-281-0/+2
|\ \ \ \
| * | | | add comment to the empty each method for not removing it in futureRajarshi Das2014-07-261-1/+2
* | | | | Merge pull request #16297 from calebthompson/extract-iterator-methodRafael Mendonça França2014-07-281-10/+14
|\ \ \ \ \
| * | | | | Extract iterator method in AR::SchemaDumperCaleb Thompson2014-07-251-10/+14
| |/ / / /
* | | | | Merge pull request #16295 from kenn/no_stacktrace_drop_taskRafael Mendonça França2014-07-282-0/+8
|\ \ \ \ \
| * | | | | No verbose backtrace by db:drop when database does not exist.Kenn Ejima2014-07-272-0/+8
* | | | | | Merge pull request #16318 from zuhao/refactor_activerecord_adapter_testYves Senn2014-07-281-1/+1
|\ \ \ \ \ \
| * | | | | | Add where condition so select_one returns the correct record.Zuhao Wan2014-07-281-1/+1
* | | | | | | Merge pull request #16319 from Domon/fix-each-validator-exampleYves Senn2014-07-281-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix example code of `EachValidator` [ci skip]Chun-wei Kuo2014-07-281-1/+1
|/ / / / / /
* | | | | | Merge pull request #16315 from eileencodes/fix-documentation-that-mentions-ma...Jeremy Kemper2014-07-272-7/+10
|\ \ \ \ \ \
| * | | | | | [ci skip] Fix documentation for @macro and reflection typeseileencodes2014-07-272-7/+10
|/ / / / / /
* | | | | | Merge pull request #16282 from davidbalbert/patch-1Guillermo Iguaran2014-07-271-1/+1
|\| | | | |
| * | | | | Fix protect_from_forgery docsDavid Albert2014-07-271-1/+1
|/ / / / /
* | | | | Fix that render layout should also be picked up by the template dependency tr...David Heinemeier Hansson2014-07-253-4/+29
* | | | | Merge pull request #16290 from a3gis/masterZachary Scott2014-07-252-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove references to SQLite3Column from documentationa3gis2014-07-251-1/+1
| * | | | Fix documentation of SQlite3Adapter.columnsa3gis2014-07-251-1/+1
* | | | | Merge pull request #16285 from noinkling/password_digest_docsRafael Mendonça França2014-07-252-2/+18
|\ \ \ \ \
| * | | | | Additional clarification on password:digest in scaffold and model generator h...noinkling2014-07-252-4/+16
| * | | | | Add password:digest information to scaffold generator help text [ci skip]noinkling2014-07-251-1/+5
| | |/ / / | |/| | |
* | | | | docs, add ref where to find valid `head` status symbols.Yves Senn2014-07-251-0/+2
* | | | | Merge pull request #16258 from mattwarrenrnp/masterYves Senn2014-07-251-11/+20
|\ \ \ \ \
| * | | | | adding indexes on tables in migration scriptsMatt Warren2014-07-241-11/+20
* | | | | | Merge pull request #16220 from pcreux/postgresql-jsonb-supportYves Senn2014-07-256-9/+64
|\ \ \ \ \ \
| * | | | | | Add support for Postgresql JSONBPhilippe Creux2014-07-246-9/+64
| | |/ / / / | |/| | | |