aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8165 from arunagw/warning_removed_unused_variablesCarlos Antonio da Silva2012-11-102-2/+2
|\ | | | | Removing warning : assigned but unused variable
| * Removing warning : assigned but unused variableArun Agrawal2012-11-102-2/+2
| |
* | Merge pull request #8154 from bogdan/has_one_association_performanceCarlos Antonio da Silva2012-11-103-1/+24
|\ \ | | | | | | Remove unwanted transaction when has one association is built
| * | Do not create useless database transaction when building `has_one` association.Bogdan Gusiev2012-11-103-1/+24
|/ /
* | Merge pull request #8164 from nikitug/keep_serialization_in_its_moduleCarlos Antonio da Silva2012-11-102-9/+13
|\ \ | |/ |/| Keep the code related to serialization in Serialization module.
| * Keep the code related to serialization in Serialization module.Nikita Afanasenko2012-11-102-9/+13
|/ | | | We should not need any `serialized_attributes` checks outside `ActiveRecord::AttributeMethods::Serialization` module.
* Merge pull request #8162 from fimmtiu/masterRafael Mendonça França2012-11-091-2/+2
|\ | | | | Trivial documentation fix for ActiveModel::Naming comment [ci skip]
| * Trivial documentation fix for ActiveModel::Naming comment.Dennis Taylor2012-11-091-2/+2
|/
* Use get in the redirection doc examplesCarlos Antonio da Silva2012-11-091-7/+7
| | | | | | | get is the most common usage, and match without an explicit verb was disallowed in 56cdc81c08b1847c5c1f699810a8c3b9ac3715a6. [ci skip]
* Gracefully handle upgrading apps with mass assigment configsAndrew White2012-11-091-0/+27
| | | | | | | | Most apps upgrading from 3.x will have options for mass assigment in their application.rb and environments/*.rb config files. Rather than just raising a NoMethodError when copying the config, this commit adds a warning message until either the protected_attributes gem is installed or the relevant config options are removed.
* Merge pull request #8158 from steveklabnik/deprecate_diffCarlos Antonio da Silva2012-11-093-3/+5
|\ | | | | Deprecate Hash#diff.
| * Deprecate Hash#diff.Steve Klabnik2012-11-093-3/+5
| | | | | | | | | | | | It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more
* | Remove not used load hooks for active_record_configCarlos Antonio da Silva2012-11-092-6/+0
| | | | | | | | | | These were removed with ActiveRecord::Model in https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#L15L156
* | fix warningsJon Leighton2012-11-091-1/+1
| |
* | Properly deprecate ConnectionHandler#connection_poolsJon Leighton2012-11-093-8/+22
| | | | | | | | | | | | | | | | Rather than just changing it and hoping for the best. Requested by @jeremy: https://github.com/rails/rails/commit/ba1544d71628abff2777c9c514142d7e9a159111#commitcomment-2106059
* | Merge pull request #8157 from steveklabnik/remove_callback_duplicationRafael Mendonça França2012-11-091-7/+8
|\ \ | | | | | | Removing duplication in callback normalization.
| * | Removing duplication in callback normalization.Steve Klabnik2012-11-091-7/+8
| |/ | | | | | | These two things were 100% identical.
* | Merge pull request #8116 from senny/7993_configure_counter_cache_for_has_manyJon Leighton2012-11-096-2/+19
|\ \ | | | | | | :counter_cache option for to support custom named counter caches
| * | :counter_cache option for to support custom named counter caches. Closes #7993Yves Senn2012-11-046-2/+19
| | |
* | | Delegate all calculations to the scope.Jon Leighton2012-11-093-4/+7
| | | | | | | | | | | | | | | | | | | | | So that the scope may be a NullRelation and return a result without executing a query. Fixes #7928
* | | CollectionProxy#pluck issues no query for a new_record? ownerJon Leighton2012-11-092-0/+5
| | | | | | | | | | | | | | | | | | | | | Fixes #8102. I couldn't find a nicer way to deal with this than delegate the call to #scope, which will be a NullRelation when we want it to be.
* | | Nullify the relation at a more general level.Jon Leighton2012-11-093-7/+14
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to avoid hacks like the "return 0 if owner.new_record?" in #count (which this commit removes). Also, the relevant foreign key may actually be present even on a new owner record, in which case we *don't* want a null relation. This logic is encapsulated in the #null_scope? method. We also need to make sure that the CollectionProxy is not 'infected' with the NullRelation module, or else the methods from there will override the definitions in CollectionProxy, leading to incorrect results. Hence the nullify: false option to CollectionAssociation#scope. (This feels a bit nasty but I can't think of a better way.)
* | Merge pull request #8151 from nashby/forwardableCarlos Antonio da Silva2012-11-091-20/+2
|\ \ | | | | | | delegate PathSet's enumerator methods
| * | delegate PathSet's enumerator methodsVasiliy Ermolovich2012-11-091-20/+2
| | |
* | | Merge pull request #8153 from steveklabnik/fix_include_blankCarlos Antonio da Silva2012-11-091-1/+1
|\ \ \ | | | | | | | | Fix message about include_blank option. [ci skip]
| * | | Fix message about include_blank option.Steve Klabnik + Katrina Owen2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/cb7d19b66badfbd1846c195913419c331701074e#commitcomment-2127148.
* | | | Relations built off collection associations with an unsaved owner should be ↵Jon Leighton2012-11-092-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null relations For example, the following should not run any query on the database: Post.new.comments.where(body: 'omg').to_a # => [] Fixes #5215.
* | | | Merge pull request #8152 from steveklabnik/squashing_guideXavier Noria2012-11-091-0/+38
|\ \ \ \ | |/ / / |/| | | Add note about squashing in contributor guide.
| * | | Add note about squashing in contributor guide.Steve Klabnik + Katrina Owen2012-11-091-0/+38
|/ / / | | | | | | | | | | | | We tell people how to do this all the time in the Issues tracker, so now we can just point them here.
* | | implement to_a and to_ary so that the Array() call in template.rb willAaron Patterson2012-11-091-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not raise so many exceptions: https://github.com/rails/rails/blob/master/actionpack/lib/action_view/template.rb#L126 irb(main):001:0> class Foo; def method_missing(*args); super; end end => nil irb(main):002:0> $DEBUG = true => true irb(main):003:0> Array(Foo.new) Exception `NoMethodError' at (irb):1 - undefined method `to_ary' for #<Foo:0x007f854390e488> Exception `NoMethodError' at (irb):1 - undefined method `to_a' for #<Foo:0x007f854390e488> => [#<Foo:0x007f854390e488>] irb(main):004:0>
* | | make the extremely useful logs debug levelAaron Patterson2012-11-091-2/+2
| | |
* | | copy the log level from the config settingsAaron Patterson2012-11-091-0/+1
| | |
* | | Merge pull request #7763 from route/full-captureCarlos Antonio da Silva2012-11-083-11/+29
|\ \ \ | | | | | | | | Kernel#capture replaced by version which can catch output from subprocesses
| * | | Kernel#capture replaced by version which can catch output from subprocessesDmitry Vorotilin2012-11-013-11/+29
| | | |
* | | | rm dead codeAaron Patterson2012-11-091-1/+1
| | | |
* | | | Merge pull request #8147 from gbchaosmaster/gemspecRafael Mendonça França2012-11-087-69/+83
|\ \ \ \ | | | | | | | | | | Reformat gemspec
| * | | | Clean up gemspecsVinny Diehl2012-11-087-69/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes.
* | | | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-093-47/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 36376560fdd02f955ae3bf6b7792b784443660ad, reversing changes made to 3148ed9a4bb7efef30b846dc945d73ceebcc3f0f. Conflicts: actionpack/lib/action_dispatch/middleware/flash.rb Reason: it broke Sam's CI https://github.com/rails/rails/pull/8017#issuecomment-10210655
* | | | | Remove free usage of #tapCarlos Antonio da Silva2012-11-081-3/+4
| | | | |
* | | | | Merge pull request #8017 from jcoglan/objectless_sessionsJon Leighton2012-11-083-10/+46
|\ \ \ \ \ | | | | | | | | | | | | Store FlashHashes in the session as plain hashes
| * | | | | Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-033-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize.
* | | | | | Merge pull request #8115 from senny/7842_handle_trailing_slash_with_enginesRafael Mendonça França2012-11-082-3/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | handle trailing slash with engines (test case for #7842)
| * | | | | routing prefix slash replacement is no longer necessaryYves Senn2012-11-041-3/+1
| | | | | |
| * | | | | test case to lock down the behavior of #7842Yves Senn2012-11-041-0/+5
| | | | | |
* | | | | | Merge pull request #8145 from sobrinho/masterRafael Mendonça França2012-11-081-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add test to avoid regression of 58e48d5
| * | | | | | Add test to avoid regression of 58e48d5292242f000dc8a87fdbb1c0ccdcf286d8Gabriel Sobrinho & Ricardo Henrique2012-11-081-0/+11
| | | | | | |
* | | | | | | Add CHANGELOG entry for #8108 on master too.Rafael Mendonça França2012-11-081-0/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #8139 from ↵Carlos Antonio da Silva2012-11-084-3/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | senny/8121_engine_generator_rakefile_without_test_unit Add app Rake tasks when -T and --dummy-path is passed to `plugin new`
| * | | | | | `plugin new` adds dummy app tasks when necessary.Yves Senn2012-11-084-3/+18
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #8121 The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created.
* | | | | | Remove not used indifferent_access requires from Base and FinderMethodsCarlos Antonio da Silva2012-11-072-3/+0
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 04:12:22 +0000