aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #12532 from vipulnsward/singleton_classRafael Mendonça França2013-10-141-2/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix `singleton_class?`
| * | | | | Fix `singleton_class?`Vipul A M2013-10-151-2/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | Due to changes from http://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39628 current `singleton_class?` implementation fails. Changed based on reference from http://bugs.ruby-lang.org/issues/7609
* | | | | Merge pull request #12530 from vipulnsward/remove_thread_safeRafael Mendonça França2013-10-141-13/+0
|\ \ \ \ \ | | | | | | | | | | | | `$SAFE = 4;` has been removed with Ruby 2.1
| * | | | | `$SAFE = 4;` has been removed with Ruby 2.1Vipul A M2013-10-141-13/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | For background - https://bugs.ruby-lang.org/issues/8468 Changset - https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/41259/diff/test/ruby/test_thread.rb
* | | | | Merge pull request #12527 from vipulnsward/sqlite_database_typesRafael Mendonça França2013-10-141-18/+16
|\ \ \ \ \ | |/ / / / |/| | | | SQLite3 Adapter datatypes cleanup
| * | | | Remove `default_primary_key_type` and extract contains of ↵Vipul A M2013-10-141-18/+16
| | | | | | | | | | | | | | | | | | | | `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters.
* | | | | Merge pull request #9499 from ↵Rafael Mendonça França2013-10-143-2/+24
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dmitry/inverse_instance_should_not_be_reloaded_after_stale_state_change Inversed instance should not be reloaded after stale state was changed Conflicts: activerecord/CHANGELOG.md
| * | | | Add a note to the changelog for #9499Dmitry Polushkin2013-10-131-0/+6
| | | | |
| * | | | add inversed accessor to association classDmitry Polushkin2013-10-131-2/+3
| | | | |
| * | | | inversed instance should not be reloaded after stale state was changedDmitry Polushkin2013-10-132-2/+17
| | | | | | | | | | | | | | | check at association reader that record is inverted and should not be reloaded because of stale was changed at target record
* | | | | Merge pull request #11833 from vipulnsward/remove_autoincrementRafael Mendonça França2013-10-142-15/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Remove sqlite specific`supports_autoincrement?` which defaults to true
| * | | | Remove sqlite specific`supports_autoincrement?` which always defaults to trueVipul A M2013-08-102-15/+3
| | | | |
* | | | | cleanup changelog entry format. [ci skip]Yves Senn2013-10-141-2/+4
| | | | |
* | | | | Extract a function to determine if the default value is a functionRafael Mendonça França2013-10-141-1/+5
| | | | |
* | | | | Push default_function to superclass to avoid method checkRafael Mendonça França2013-10-143-15/+18
| | | | |
* | | | | Dump the default function when the primary key is uuidRafael Mendonça França2013-10-142-2/+3
| | | | | | | | | | | | | | | | | | | | Fixes #12489
* | | | | Merge pull request #12486 from cjolly/newline-eof-structure-sqlRafael Mendonça França2013-10-131-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | newline at end of structure.sql file
| * | | | newline at end of structure.sql fileChad Jolly2013-10-131-0/+1
| | | | |
* | | | | Merge pull request #12518 from vipulnsward/remove_count_optionsRafael Mendonça França2013-10-135-20/+17
|\ \ \ \ \ | | | | | | | | | | | | `Relation#count` doesn't use options anymore.
| * | | | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵Vipul A M2013-10-143-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | `Relation#maximum`, `Relation#calculate`, `perform_calculation`, `NullRelation#calculate` as they isn't used anymore.
| * | | | | `Relation#count` doesn't use options anymore.Vipul A M2013-10-133-8/+5
| | | | | |
* | | | | | Add nodoc to methodRafael Mendonça França2013-10-131-1/+1
| | | | | |
* | | | | | Merge pull request #12508 from ↵Rafael Mendonça França2013-10-134-2/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/12415_generate_subqueries_for_relation_from_binding_params Generate subquery for Relation passed as array condition for where Conflicts: activerecord/CHANGELOG.md
| * | | | | | Generate subquery for Relation passed as array condition for wherePaul Nikitochkin2013-10-134-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of executing 2 queries for fetching records filtered by array condition with Relation, added generation of subquery to current query. This behaviour will be consistent when passes Relation as hash condition to where Closes: #12415
* | | | | | | Merge pull request #12456 from razielgn/ar-test-fixesRafael Mendonça França2013-10-133-5/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed MRI dependent stuff in AR tests
| * | | | | | | Allow methods arity below -1 in assert_responds.Federico Ravasio2013-10-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every method from MRI's core classes is written in C. This means Method#arity always returns -1 for methods with a variable number of arguments. This is not the case with Rubinius, where, for example Array#slice! is implemented in Ruby and has arity -2, since is defined as def slice!(start, length = undefined)
| * | | | | | | Assert presence of "frozen" in error message, not the full MRI message.Federico Ravasio2013-10-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to all the other issues regarding message independent assertions to make Rails compatible with other Ruby implementations other than MRI. The best way here would be to have a specific error raised when modifying frozen objects, like FrozenObjectError or something. But since Ruby doesn't provide such a thing, we must limit the assertion to the lowest common denominator, which is word "frozen".
| * | | | | | | Just change ENV and restore it afterwards.Federico Ravasio2013-10-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stubbing ENV[] is not safe outside MRI. At some point after the stubbing has occurred a backtrace is printed to the ActiveSupport warning log: there Rubinius accesses ENV['RBX_NOCOLOR'] to determine if it should print the backtrace with colors or not, causing the stub to fail. Other implementations might access ENV in a different way too, we just can't predict it. The only thing we can do here is to actually set the ENV with what we want and restore it afterwards.
* | | | | | | | Merge pull request #12511 from ↵Rafael Mendonça França2013-10-132-3/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative
| * | | | | | | | Make missed association exception message more informativePaul Nikitochkin2013-10-132-3/+9
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add target class name, which should have missed association on preload, into exception message to simplify detecting problem part.
* | | | | | | | Merge pull request #12514 from ↵Rafael Mendonça França2013-10-133-13/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schuetzm/stdout-logging-with-implicit-development-env Make logging to stdout work again with implicit `development` env
| * | | | | | | | Make logging to stdout work again with implicit `development` envMarc Schütz2013-10-133-13/+54
| |/ / / / / / /
* | | | | | | | Merge pull request #12491 from shamanime/patch-1Rafael Mendonça França2013-10-131-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix wrong variable name used in the select_day method documentation
| * | | | | | | | Fix wrong variable name used in the select_day method documentationJefferson Queiroz Venerando2013-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The variable name created in the example is `my_date`, the methods were using `my_time` instead.
* | | | | | | | | Merge pull request #12493 from drodriguez/patch-1Rafael Mendonça França2013-10-131-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Keep code consistent with previous code blocks.
| * | | | | | | | | Keep code consistent with previous code blocks.Daniel Rodríguez Troitiño2013-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge pull request #12517 from vipulnsward/destructive_map_amRafael Mendonça França2013-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Change `map` to `map!` to save extra array creation on new array
| * | | | | | | | | | Change `map` to `map!` to save extra array creation on new arrayVipul A M2013-10-131-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #12516 from vipulnsward/drop_varRafael Mendonça França2013-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Drop unused iterator var
| * | | | | | | | | Drop unused iterator varVipul A M2013-10-131-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #11791 from versioncontrol/includes_with_persistent_selectRafael Mendonça França2013-10-123-1/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Includes with persistent select, fixes #11773
| * | | | | | | | | Fixes #11773 when using includes combined with select, the select statement ↵Edo Balvers2013-10-083-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was overwritten.
* | | | | | | | | | Merge pull request #12507 from malavbhavsar/doc_patchRafael Mendonça França2013-10-122-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Some fixes in docs [ci skip]
| * | | | | | | | | | Some fixes in docs [ci skip]Malav Bhavsar2013-10-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update a link to point to right section in api docs Fix a typo
* | | | | | | | | | | Merge pull request #12512 from sbagdat/patch-1Andrew White2013-10-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | Fix a writing mistake
| * | | | | | | | | | Fix a writing mistakeSıtkı Bağdat2013-10-121-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | A small mistake found in the line of ```The default error is "can't be empty"``` for ```:presence``` helper. ```empty``` word changed to ```blank```.
* | | | | | | | | | Revert "Merge pull request #12480 from iwiznia/master"Jeremy Kemper2013-10-114-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e5f5a838b96a362534d9bb60d02334439ed9784c, reversing changes made to d7567f3290a50952494e9213556a1f283a6cf3a0.
* | | | | | | | | | no reason to do this column addition and subtraction businessAaron Patterson2013-10-111-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12480 from iwiznia/masterRafael Mendonça França2013-10-114-0/+57
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | flatten and flatten! methods for ActiveSupport::Duration
| * | | | | | | | | | flatten and flatten! methods for ActiveSupport::DurationIonatan Wiznia2013-10-114-0/+57
| |/ / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 04:23:43 +0000