aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16284 from arthurnn/transactionsRafael Mendonça França2014-07-283-62/+81
|\
| * savepoint_name should return nil for non-savepoint transactionsArthur Neves2014-07-282-4/+7
| * 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-281-0/+2
|\ \ \
| * | | No verbose backtrace by db:drop when database does not exist.Kenn Ejima2014-07-271-0/+2
* | | | [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
* | | Add support for Postgresql JSONBPhilippe Creux2014-07-244-0/+29
| |/ |/|
* | fix, mysql `db:purge` respects `Rails.env`.Yves Senn2014-07-241-1/+1
* | 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-241-1/+9
|/
* Merge pull request #16231 from Envek/type_in_referencesYves Senn2014-07-222-4/+25
|\
| * Allow to specify a type for foreign key column in migrationsAndrey Novikov2014-07-222-2/+10
|/
* Touch option description grammatical error fixed [ci skip]vadivelan2014-07-211-1/+1
* 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-183-2/+13
* | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_methodMatthew Draper2014-07-181-8/+2
|\ \
| * | Dont swallow errors when bad alias_methodArthur Neves2014-06-241-8/+2
* | | Prefer if/else for this caseRafael Mendonça França2014-07-171-3/+2
* | | Merge pull request #16188 from marianovalles/fix_rational_to_decimal_type_castRafael Mendonça França2014-07-171-2/+5
|\ \ \
| * | | Fix decimal_test module and add new test for object responding to to_dMariano Valles2014-07-161-1/+0
| * | | Fix case statement to use ::Numeric and ::StringMariano Valles2014-07-161-1/+1
| * | | Change class evaluation for Rationals in cast_valueMariano Valles2014-07-161-4/+6
| * | | Fix rational to decimal on type_cast_from_userMariano Valles2014-07-161-1/+3
* | | | Remove need for macro instance vareileencodes2014-07-171-11/+14
* | | | Remove unused 1:1 association :remote optionChris Griego2014-07-161-1/+1
* | | | Merge pull request #15944 from seuros/uuidRafael Mendonça França2014-07-161-1/+10
|\ \ \ \
| * | | | Treat invalid uuid as nilAbdelkader Boudih2014-07-141-1/+10
* | | | | Merge pull request #16183 from goddamnhippie/fix-psych-warningRafael Mendonça França2014-07-161-0/+5
|\ \ \ \ \
| * | | | | Move #encode_with to RelationGustavo Beathyate2014-07-152-4/+5
| * | | | | Implement required #encode_withGustavo Beathyate2014-07-151-0/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #15718 from chancancode/regression_from_15694Godfrey Chan2014-07-161-0/+5
|\ \ \ \ \
| * | | | | Fixed a regression introduced in 84cf156Godfrey Chan2014-06-141-0/+5
* | | | | | nodoc enum hooks [ci skip]Rafael Mendonça França2014-07-161-2/+2
* | | | | | Merge pull request #16138 from sgrif/sg-attribute-set-keyYves Senn2014-07-162-5/+5
|\ \ \ \ \ \
| * | | | | | AttributeSet#include? -> AttributeSet#key?Sean Griffin2014-07-112-5/+5
* | | | | | | Move uuid_v5 and uuid_v3 to Digest::UUIDRafael Mendonça França2014-07-151-2/+2
* | | | | | | Merge pull request #16180 from rafaelfranca/rm-dirtyRafael Mendonça França2014-07-151-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Deprecate ActiveModel::Dirty#reset_changes in favor of #clear_changes_informa...Rafael Mendonça França2014-07-151-2/+2
* | | | | | | | Merge branch 'master' of git://github.com/rails/railsGodfrey Chan2014-07-153-6/+18
|\| | | | | | |