aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Remove @state.parent assignment on commitArthur Neves2014-07-291-2/+1
* [ci skip] fix doc typo for validates_uniqueness_ofSatoru Yamasaki2014-07-291-1/+1
* remove blank lines in the start of the ActiveRecord filesPonomarev Nikolay2014-07-298-8/+0
* 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 #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
* | | | | Add where condition so select_one returns the correct record.Zuhao Wan2014-07-281-1/+1
* | | | | [ci skip] Fix documentation for @macro and reflection typeseileencodes2014-07-272-7/+10
|/ / / /
* | | | 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 #16220 from pcreux/postgresql-jsonb-supportYves Senn2014-07-256-9/+64
|\ \ \ \ | |_|/ / |/| | |
| * | | Add support for Postgresql JSONBPhilippe Creux2014-07-246-9/+64
|/ / /
* | | 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 #16231 from Envek/type_in_referencesYves Senn2014-07-226-5/+56
|\ \
| * | Allow to specify a type for foreign key column in migrationsAndrey Novikov2014-07-226-3/+46
|/ /
* | Merge pull request #16253 from zuhao/refactor_activerecord_nested_through_ass...Yves Senn2014-07-221-1/+1
|\ \
| * | Make sure assertion passes for postgresql.Zuhao Wan2014-07-221-1/+1
* | | Remove redundant that already happened in teardown.Zuhao Wan2014-07-221-1/+0
|/ /
* | build fix, remove not null constraint.Yves Senn2014-07-221-1/+1
* | Merge pull request #16250 from zuhao/refactor_activerecord_migration_testYves Senn2014-07-221-1/+1
|\ \
| * | Remove length limit that results failure in other tests.Zuhao Wan2014-07-221-1/+1
* | | Remove the side-effects of validates_presence_of.Zuhao Wan2014-07-221-2/+3
|/ /
* | Touch option description grammatical error fixed [ci skip]vadivelan2014-07-211-1/+1
* | Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
|\ \
| * | Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
* | | Merge pull request #16227 from Aguynamedsteve/typo_correctionYves Senn2014-07-191-1/+1
|\ \ \
| * | | Fixed typo in commentSteve2014-07-191-1/+1
* | | | create_join_table uses same logic as HABTM reflectionsStefan Kanev2014-07-185-2/+44
* | | | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_methodMatthew Draper2014-07-183-10/+27
|\ \ \ \
| * | | | Dont swallow errors when bad alias_methodArthur Neves2014-06-243-10/+27
* | | | | Disable some tests on SQLiteRafael Mendonça França2014-07-171-77/+77
* | | | | Prefer if/else for this caseRafael Mendonça França2014-07-171-3/+2