Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Extend fixture label replacement to allow string interpolation | Eric Steele | 2014-03-15 | 4 | -1/+19 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14396 from afshinator/master | Jeremy Kemper | 2014-03-15 | 1 | -11/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Reword 5.6 strong parameters and private method stuff [ci skip] | Afshin Mokhtari | 2014-03-15 | 1 | -11/+28 | |
* | | | | | | | Merge pull request #14395 from arthurnn/fix_mailer_preview_test | Jeremy Kemper | 2014-03-15 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix MailerPreview broken tests | Arthur Neves | 2014-03-15 | 1 | -4/+4 | |
* | | | | | | | | Merge pull request #12662 from nashby/include-hidden-collection | Rafael Mendonça França | 2014-03-15 | 3 | -3/+18 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | add include_hidden option to collection_check_boxes helper | Vasiliy Ermolovich | 2013-10-27 | 3 | -4/+19 | |
* | | | | | | | | Merge pull request #14394 from zoltankiss/fix_typo | Arthur Neves | 2014-03-15 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Minor grammer, code conventions fix [ci skip] | Zoltan Kiss | 2014-03-15 | 1 | -2/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Clarify AV::Digestor.digest method signature docs and deprecation warning | Jeremy Kemper | 2014-03-15 | 2 | -24/+23 | |
* | | | | | | | | Remove deprecation on active_support/core_ext/class/attribute_accessors requi... | Jeremy Kemper | 2014-03-15 | 1 | -5/+3 | |
* | | | | | | | | Merge pull request #14380 from tgxworld/use_teardown_helper_method_in_activer... | Yves Senn | 2014-03-15 | 49 | -61/+51 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use teardown helper method. | Guo Xiang Tan | 2014-03-14 | 49 | -61/+51 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Obey `validate: false` option for habtm | Carlos Antonio da Silva | 2014-03-14 | 4 | -1/+39 | |
* | | | | | | | Merge pull request #14387 from huoxito/touch-api-doc | Arthur Nogueira Neves | 2014-03-14 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update callbacks executed on AR::Base#touch [skip ci] | Washington Luiz | 2014-03-14 | 1 | -2/+2 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #10278 from codeodor/fix-to_json-for-Enumerable | Godfrey Chan | 2014-03-14 | 4 | -12/+40 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix #to_json for BasicObject Enumerables | Sammy Larbi | 2014-03-14 | 4 | -12/+40 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #14373 from schneems/schneems/jdbc-ar-2 | Rafael Mendonça França | 2014-03-14 | 3 | -6/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | better test error messages | schneems | 2014-03-14 | 1 | -4/+4 | |
| * | | | | | | | Allow custom JDBC urls | schneems | 2014-03-14 | 2 | -2/+8 | |
* | | | | | | | | Fix the resolver cache and stop mutating the lookup_context | Rafael Mendonça França | 2014-03-14 | 4 | -32/+10 | |
* | | | | | | | | Merge pull request #14329 from pch/digestor-lookup-fix | Rafael Mendonça França | 2014-03-14 | 12 | -33/+130 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Introduce #with_formats_and_variants to prevent problems with mutating finder... | Łukasz Strzałkowski | 2014-03-14 | 4 | -5/+31 | |
| * | | | | | | | Add mocked disable_cache for FixtureFinder | Łukasz Strzałkowski | 2014-03-14 | 1 | -0/+4 | |
| * | | | | | | | Set format in finder | Łukasz Strzałkowski | 2014-03-14 | 1 | -3/+8 | |
| * | | | | | | | Rename _setup_options to _options_for_digest | Łukasz Strzałkowski | 2014-03-14 | 1 | -3/+3 | |
| * | | | | | | | Disable LookupContext's cache when looking for template | Łukasz Strzałkowski | 2014-03-14 | 1 | -2/+6 | |
| * | | | | | | | Don't pass hash as keys to #find method | Łukasz Strzałkowski | 2014-03-14 | 1 | -1/+1 | |
| * | | | | | | | Add variants to Template class | Łukasz Strzałkowski | 2014-03-14 | 3 | -12/+20 | |
| * | | | | | | | Don't create addition vars, use options[] directly | Łukasz Strzałkowski | 2014-03-13 | 1 | -7/+2 | |
| * | | | | | | | Don't pass variant in params, it's ignored | Łukasz Strzałkowski | 2014-03-13 | 1 | -1/+1 | |
| * | | | | | | | Ensure LookupContext in Digestor selects correct variant | Piotr Chmolowski | 2014-03-09 | 8 | -8/+63 | |
* | | | | | | | | Take in consideration guides CHANGELOG | Rafael Mendonça França | 2014-03-14 | 1 | -2/+2 | |
* | | | | | | | | Match the whole string | Rafael Mendonça França | 2014-03-14 | 1 | -1/+1 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error | Rafael Mendonça França | 2014-03-14 | 1 | -1/+1 | |
* | | | | | | | Avoid duplicated conditionals | Carlos Antonio da Silva | 2014-03-14 | 1 | -2/+1 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #14378 from afshinator/master | Godfrey Chan | 2014-03-13 | 1 | -3/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix probs in sections 5.6 and 5.9; [ci skip] | Afshin Mokhtari | 2014-03-13 | 1 | -3/+3 | |
* | | | | | | | No need to binds be optional | Rafael Mendonça França | 2014-03-13 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14372 from arthurnn/fix_query_cache_binds | Rafael Mendonça França | 2014-03-13 | 4 | -12/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Make select_all on query cache accept a Relation without binds. | Arthur Neves | 2014-03-13 | 4 | -12/+24 | |
* | | | | | | | Merge pull request #14376 from laurocaetano/test-deprecation-warning-for-find | Godfrey Chan | 2014-03-13 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add test for deprecation warning for passing an AR object to `find`. | Lauro Caetano | 2014-03-13 | 1 | -0/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14375 from laurocaetano/test-deprecation-warning-for-exists | Aaron Patterson | 2014-03-13 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Test deprecation warning for passing an ActiveRecord object to | Lauro Caetano | 2014-03-13 | 1 | -0/+6 | |
| |/ / / / / / | ||||||
* / / / / / / | require actions rather than create_file | Aaron Patterson | 2014-03-13 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | passing an instance of an AR object to `find` is deprecated | Aaron Patterson | 2014-03-13 | 5 | -6/+13 | |
* | | | | | | passing an ActiveRecord object to `exists?` is deprecated. | Aaron Patterson | 2014-03-13 | 5 | -4/+14 | |
* | | | | | | make tests pass on Ruby 2.2 | Aaron Patterson | 2014-03-13 | 2 | -5/+5 |