aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / | |/| |
* | | | Merge pull request #16272 from tgxworld/fix_template_assertion_when_opening_a...Matthew Draper2014-07-252-9/+53
|\ \ \ \ | |/ / / |/| | |
| * | | Improve description of tests.Guo Xiang Tan2014-07-251-4/+4
| * | | Bug fix for assert_template when opening a new session.Guo Xiang Tan2014-07-252-5/+49
* | | | Merge pull request #16281 from arthurnn/copy_default_proc_hwiaSantiago Pastorino2014-07-243-0/+16
|\ \ \ \
| * | | | Make HWIA copy the default proc too.Arthur Neves2014-07-243-0/+16
|/ / / /
* | | | tests, run adapter specific rake tests only for the right adapter.Yves Senn2014-07-243-0/+6
* | | | build fix, fix error introduced with 091b246bb0111357edbb9703ea342a944b04deb6Yves Senn2014-07-241-2/+2
* | | | fix, mysql `db:purge` respects `Rails.env`.Yves Senn2014-07-242-1/+5
* | | | clenaup, unify CHANGELOG format. [ci skip]Yves Senn2014-07-241-5/+7
* | | | Merge pull request #16280 from a3gis/masterMatthew Draper2014-07-241-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix documentation typo in ConnectionSpecification::Resolve.speca3gis2014-07-241-1/+1
| * | | Fixes #16265a3gis2014-07-241-1/+1
* | | | pg, `change_column_default, :table, :column, nil` issues `DROP DEFAULT`.Yves Senn2014-07-242-1/+16
* | | | Merge pull request #16276 from y-yagi/bug_report_templatesMatthew Draper2014-07-242-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip]Add i18n master to the Gemfileyuuji.yaginuma2014-07-242-0/+2
| |/ /
* | | Merge pull request #16260 from akshay-vishnoi/doc-changeMatthew Draper2014-07-241-2/+1
|\ \ \ | |/ / |/| |
| * | Calling require_self twice in css raises Sprockets::ArgumentError exception [...Akshay Vishnoi2014-07-241-2/+1
* | | Remove mocha usageRafael Mendonça França2014-07-231-2/+5