aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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 t...Jeremy Kemper2014-03-161-0/+1
| * | | | | | | 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
| * | | | | | | Remove extra white-spaces [ci skip]Robin Dupret2014-03-161-13/+13
| * | | | | | | 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 interpolationEric Steele2014-03-154-1/+19
| |/ / / / / / /
| * | | | | | | Merge pull request #14396 from afshinator/masterJeremy Kemper2014-03-151-11/+28
| |\ \ \ \ \ \ \
| | * | | | | | | 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 testsArthur Neves2014-03-151-4/+4
| * | | | | | | | | 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 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]Zoltan Kiss2014-03-151-2/+1
| |/ / / / / / / / /
| * | | | | | | | | 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 requi...Jeremy Kemper2014-03-151-5/+3
| * | | | | | | | | Merge pull request #14380 from tgxworld/use_teardown_helper_method_in_activer...Yves Senn2014-03-1549-61/+51
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Use teardown helper method.Guo Xiang Tan2014-03-1449-61/+51
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Obey `validate: false` option for habtmCarlos Antonio da Silva2014-03-144-1/+39
| * | | | | | | | Merge pull request #14387 from huoxito/touch-api-docArthur Nogueira Neves2014-03-141-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update callbacks executed on AR::Base#touch [skip ci]Washington Luiz2014-03-141-2/+2
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #10278 from codeodor/fix-to_json-for-EnumerableGodfrey Chan2014-03-144-12/+40
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | better test error messagesschneems2014-03-141-4/+4
| | * | | | | | | | Allow custom JDBC urlsschneems2014-03-142-2/+8
| * | | | | | | | | Fix the resolver cache and stop mutating the lookup_contextRafael Mendonça França2014-03-144-32/+10
| * | | | | | | | | Merge pull request #14329 from pch/digestor-lookup-fixRafael Mendonça França2014-03-1412-33/+130
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Introduce #with_formats_and_variants to prevent problems with mutating finder...Łukasz Strzałkowski2014-03-144-5/+31
| | * | | | | | | | 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
| | * | | | | | | | Ensure LookupContext in Digestor selects correct variantPiotr Chmolowski2014-03-098-8/+63
| * | | | | | | | | 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
| * | | | | | | | 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]Afshin Mokhtari2014-03-131-3/+3
| * | | | | | | | No need to binds be optionalRafael Mendonça França2014-03-131-2/+2
| |/ / / / / / /
| * | | | | | | Merge pull request #14372 from arthurnn/fix_query_cache_bindsRafael Mendonça França2014-03-134-12/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Make select_all on query cache accept a Relation without binds.Arthur Neves2014-03-134-12/+24