aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #14090 from ↵Aaron Patterson2014-03-172-10/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortisque/kevin/stream_error_in_main_thread_if_not_committed re-raise error if error occurs before committing in streaming
| * | | | | | | | | | | | re-raise error if error occurs before committing in streamingKevin Casey2014-03-142-10/+30
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update the tests, using an if-else
* | | | | | | | | | | | `where.not` adds `references` for `includes`.Yves Senn2014-03-174-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14406.
* | | | | | | | | | | | fix `number_to_percentage` with `Float::NAN`, `Float::INFINITY`.Yves Senn2014-03-174-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14405. This is a follow-up to 9e997e9039435617b6a844158f5437e97f6bc107 to restore the documented behavior.
* | | | | | | | | | | | format ActiveRecord CHANGELOG. [ci skip]Yves Senn2014-03-171-8/+9
| | | | | | | | | | | |
* | | | | | | | | | | | Fix assertionsCarlos Antonio da Silva2014-03-161-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Add an explicit require for 4ece124396669d3580e7f229ab407a0d4882727a rather ↵Jeremy Kemper2014-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than assume SecureRandom is available
* | | | | | | | | | | | Avoid concurrent test collision on the same memcache server by namespacing keysJeremy Kemper2014-03-161-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Use nested_scope? not shallow? to determine whether to copy optionsAndrew White2014-03-163-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388.
* | | | | | | | | | | | Remove extra white-spaces [ci skip]Robin Dupret2014-03-161-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to 024e5e31
* | | | | | | | | | | | Let COMMAND_WHITELIST be an Array, not a StringAkira Matsuda2014-03-161-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #14399 from genericsteele/fixture-label-string-interpolationJeremy Kemper2014-03-154-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Extend fixture label replacement to allow string interpolation
| * | | | | | | | | | | | Extend fixture label replacement to allow string interpolationEric Steele2014-03-154-1/+19
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows fixtures to use their $LABEL as part of a string instead of limiting use to the entire value. mark: first_name: $LABEL username: $LABEL1973 email: $LABEL@$LABELmail.com users(:mark).first_name # => mark users(:mark).username # => mark1973 users(:mark).email # => mark@markmail.com
* | | | | | | | | | | | Merge pull request #14396 from afshinator/masterJeremy Kemper2014-03-151-11/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Reword 5.6 strong parameters and private method stuff [ci skip]
| * | | | | | | | | | | | Reword 5.6 strong parameters and private method stuff [ci skip]Afshin Mokhtari2014-03-151-11/+28
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #14395 from arthurnn/fix_mailer_preview_testJeremy Kemper2014-03-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MailerPreview broken tests
| * | | | | | | | | | | | | Fix MailerPreview broken testsArthur Neves2014-03-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `BaseMailerPreview.welcome` is an instance method, so we need to stub the method on a instance level and not on Class. The stub is important to make sure the Message object is the same in the other expectations. This was working randomly because Mocha uses == to compare two objects on the `with()` expectation and even if the Mail::Message objects were not the same object they are equal, but thats not the case in 100% of the runs. So we need to make sure we use `.any_instance` method and have the right message object.
* | | | | | | | | | | | | | Merge pull request #12662 from nashby/include-hidden-collectionRafael Mendonça França2014-03-153-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add include_hidden option to collection_check_boxes helper Conflicts: actionview/CHANGELOG.md actionview/test/template/form_collections_helper_test.rb
| * | | | | | | | | | | | | add include_hidden option to collection_check_boxes helperVasiliy Ermolovich2013-10-273-4/+19
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #14394 from zoltankiss/fix_typoArthur Neves2014-03-151-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor grammer, code conventions fix [ci skip]
| * | | | | | | | | | | | | | Minor grammer, code conventions fix [ci skip]Zoltan Kiss2014-03-151-2/+1
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb
* | | | | | | | | | | | | | Clarify AV::Digestor.digest method signature docs and deprecation warningJeremy Kemper2014-03-152-24/+23
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Remove deprecation on active_support/core_ext/class/attribute_accessors ↵Jeremy Kemper2014-03-151-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requires. Appropriate to keep this, users don't care that the implementation got unified.
* | | | | | | | | | | | | | Merge pull request #14380 from ↵Yves Senn2014-03-1549-61/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tgxworld/use_teardown_helper_method_in_activerecord Use teardown helper method.
| * | | | | | | | | | | | | Use teardown helper method.Guo Xiang Tan2014-03-1449-61/+51
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-Up to https://github.com/rails/rails/pull/14348 Ensure that SQLCounter.clear_log is called after each test. This is a step to prevent side effects when running tests. This will allow us to run them in random order.
* | | | | | | | | | | | | Obey `validate: false` option for habtmCarlos Antonio da Silva2014-03-144-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14383.
* | | | | | | | | | | | | Merge pull request #14387 from huoxito/touch-api-docArthur Nogueira Neves2014-03-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update callbacks executed on AR::Base#touch [skip ci]
| * | | | | | | | | | | | | Update callbacks executed on AR::Base#touch [skip ci]Washington Luiz2014-03-141-2/+2
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of https://github.com/rails/rails/pull/12031 after_commit and after_rollback are also executed
* | | | | | | | | | | | | Merge pull request #10278 from codeodor/fix-to_json-for-EnumerableGodfrey Chan2014-03-144-12/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #to_json for BasicObject Enumerables
| * | | | | | | | | | | | | Fix #to_json for BasicObject EnumerablesSammy Larbi2014-03-144-12/+40
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #14373 from schneems/schneems/jdbc-ar-2Rafael Mendonça França2014-03-143-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom JDBC urls
| * | | | | | | | | | | | | better test error messagesschneems2014-03-141-4/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Allow custom JDBC urlsschneems2014-03-142-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mitigates #14323
* | | | | | | | | | | | | | Fix the resolver cache and stop mutating the lookup_contextRafael Mendonça França2014-03-144-32/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we had a bug in the resolver cache so the disable_cache were not working when passing options to find
* | | | | | | | | | | | | | Merge pull request #14329 from pch/digestor-lookup-fixRafael Mendonça França2014-03-1412-33/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure LookupContext in Digestor selects correct variant
| * | | | | | | | | | | | | Introduce #with_formats_and_variants to prevent problems with mutating ↵Łukasz Strzałkowski2014-03-144-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finder object
| * | | | | | | | | | | | | Add mocked disable_cache for FixtureFinderŁukasz Strzałkowski2014-03-141-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Set format in finderŁukasz Strzałkowski2014-03-141-3/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rename _setup_options to _options_for_digestŁukasz Strzałkowski2014-03-141-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Disable LookupContext's cache when looking for templateŁukasz Strzałkowski2014-03-141-2/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't pass hash as keys to #find methodŁukasz Strzałkowski2014-03-141-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add variants to Template classŁukasz Strzałkowski2014-03-143-12/+20
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't create addition vars, use options[] directlyŁukasz Strzałkowski2014-03-131-7/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't pass variant in params, it's ignoredŁukasz Strzałkowski2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're setting variant above, in request object directly
| * | | | | | | | | | | | | Ensure LookupContext in Digestor selects correct variantPiotr Chmolowski2014-03-098-8/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to: #14242 #14243 14293 Variants passed to LookupContext#find() seem to be ignored, so I've used the setter instead: `finder.variants = [ variant ]`. I've also added some more test cases for variants. Hopefully this time passing tests will mean it actually works.
* | | | | | | | | | | | | | Take in consideration guides CHANGELOGRafael Mendonça França2014-03-141-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Match the whole stringRafael Mendonça França2014-03-141-1/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Force sass-rails ~> 4.0.2 to avoid sprockets compatibility errorRafael Mendonça França2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/sass-rails/issues/191 for more information
* | | | | | | | | | | | | Avoid duplicated conditionalsCarlos Antonio da Silva2014-03-141-2/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #14378 from afshinator/masterGodfrey Chan2014-03-131-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix probs in sections 5.6 and 5.9; [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 15:06:09 +0000