aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge pull request #14376 from laurocaetano/test-deprecation-warning-for-findGodfrey Chan2014-03-131-0/+6
|\ \ \
| * | | Add test for deprecation warning for passing an AR object to `find`.Lauro Caetano2014-03-131-0/+6
|/ / /
* | | Merge pull request #14375 from laurocaetano/test-deprecation-warning-for-existsAaron Patterson2014-03-131-0/+6
|\ \ \
| * | | Test deprecation warning for passing an ActiveRecord object toLauro Caetano2014-03-131-0/+6
| |/ /
* / / require actions rather than create_fileAaron Patterson2014-03-131-1/+1
|/ /
* | passing an instance of an AR object to `find` is deprecatedAaron Patterson2014-03-135-6/+13
* | passing an ActiveRecord object to `exists?` is deprecated.Aaron Patterson2014-03-135-4/+14
* | make tests pass on Ruby 2.2Aaron Patterson2014-03-132-5/+5
* | Use Sqlite3 adapter in examplesJulian Simioni2014-03-121-2/+2
* | use the body proxy to freeze headersAaron Patterson2014-03-125-12/+57
* | just ask the response for the commit status, we do not need to ask the jarAaron Patterson2014-03-121-1/+1
* | only write the jar if the response isn't committedAaron Patterson2014-03-126-10/+57
* | Merge pull request #14366 from sukolsak/grammarLauro Caetano2014-03-121-1/+1
|\ \
| * | Fix a grammatical error in the i18n guide [ci skip]sukolsak2014-03-121-1/+1
* | | Merge pull request #14364 from why-el/better-docs-for-update-attributeArthur Nogueira Neves2014-03-121-0/+2
|\ \ \ | |/ / |/| |
| * | Enhance docs for update_attribute [ci-skip]Mohamed Wael Khobalatte2014-03-121-0/+2
* | | use method_defined? to check whether or not a method is definedAaron Patterson2014-03-121-1/+1
* | | Merge pull request #14363 from arthurnn/usec_tests_mysql56Rafael Mendonça França2014-03-122-3/+10
|\ \ \ | |/ / |/| |
| * | Change usec to 0 on tests that compare secondsArthur Neves2014-03-121-3/+3