aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| |/ / / / /
* | | | | | Merge pull request #12503 from arunagw/removed-unused-requireRafael Mendonça França2013-10-111-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | No need to require rbconfig as we are using Gem.ruby
| * | | | | | No need to require rbconfig as we are using Gem.rubyArun Agrawal2013-10-111-1/+0
|/ / / / / /
* | | | | | refactor a little so we can remove some methodsAaron Patterson2013-10-102-4/+1
| | | | | |
* | | | | | the parent node is on the stack, so use itAaron Patterson2013-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't need to walk back up the node's parents when we have the parent on the stack
* | | | | | pass the parent node to the construct methodAaron Patterson2013-10-101-7/+6
| | | | | |
* | | | | | nodes do not need to be sortedAaron Patterson2013-10-101-1/+1
| | | | | |
* | | | | | delete unused codeAaron Patterson2013-10-102-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we merge trees from the top down, we don't need to search through the whole tree for particular nodes, just walk it and merge.
* | | | | | merge JoinDependency as outer joinsAaron Patterson2013-10-102-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | Merge JoinDependency objects as outer joins
* | | | | | stuff the join dependency object in the "anything goes" hash.Aaron Patterson2013-10-104-6/+8
| | | | | |
* | | | | | stop splatting things back and forthAaron Patterson2013-10-102-2/+2
| | | | | |
* | | | | | simplify each method.Aaron Patterson2013-10-101-8/+2
| |_|/ / / |/| | | | | | | | | | | | | | Stop writing terrible code Aaron. This is Ruby, not Scheme
* | | | | Merge pull request #12339 from tjschuck/bcrypt_cost_attrJeremy Kemper2013-10-103-1/+13
|\ \ \ \ \ | |_|_|/ / |/| | | | Use bcrypt's public cost attr instead of internal constant
| * | | | Use bcrypt's public cost attr, not internal constantT.J. Schuck2013-10-103-1/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: - https://github.com/codahale/bcrypt-ruby/pull/63 - https://github.com/codahale/bcrypt-ruby/pull/64 - https://github.com/codahale/bcrypt-ruby/pull/65
* / / / Respect `SCRIPT_NAME` when using `redirect` with a relative pathAndrew White2013-10-103-0/+136
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: # application routes.rb mount BlogEngine => '/blog' # engine routes.rb get '/admin' => redirect('admin/dashboard') This now redirects to the path `/blog/admin/dashboard`, whereas before it would've generated an invalid url because there would be no slash between the host name and the path. It also allows redirects to work where the application is deployed to a subdirectory of a website. Fixes #7977
* | | stop creating a bunch of relation objects when we can slap all the joins on ↵Aaron Patterson2013-10-092-8/+3
| | | | | | | | | | | | at once
* | | Merge branch 'builder-instances'Rafael Mendonça França2013-10-098-59/+43
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 12:27:57 +0000