Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Use nested_scope? not shallow? to determine whether to copy options | Andrew White | 2014-03-16 | 3 | -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 Dupret | 2014-03-16 | 1 | -13/+13 | |
| | | | | | | | | | | | | Follow up to 024e5e31 | |||||
* | | | Let COMMAND_WHITELIST be an Array, not a String | Akira Matsuda | 2014-03-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #14399 from genericsteele/fixture-label-string-interpolation | Jeremy Kemper | 2014-03-15 | 4 | -1/+19 | |
|\ \ \ | | | | | | | | | Extend fixture label replacement to allow string interpolation | |||||
| * | | | Extend fixture label replacement to allow string interpolation | Eric Steele | 2014-03-15 | 4 | -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/master | Jeremy Kemper | 2014-03-15 | 1 | -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 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 | |||||
| * | | | | Fix MailerPreview broken tests | Arthur Neves | 2014-03-15 | 1 | -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-collection | Rafael Mendonça França | 2014-03-15 | 3 | -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 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] | |||||
| * | | | | | Minor grammer, code conventions fix [ci skip] | Zoltan Kiss | 2014-03-15 | 1 | -2/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb | |||||
* | | | | | 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 ↵ | Jeremy Kemper | 2014-03-15 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | | | requires. Appropriate to keep this, users don't care that the implementation got unified. | |||||
* | | | | | Merge pull request #14380 from ↵ | Yves Senn | 2014-03-15 | 49 | -61/+51 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | tgxworld/use_teardown_helper_method_in_activerecord Use teardown helper method. | |||||
| * | | | | Use teardown helper method. | Guo Xiang Tan | 2014-03-14 | 49 | -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 habtm | Carlos Antonio da Silva | 2014-03-14 | 4 | -1/+39 | |
| | | | | | | | | | | | | | | | | Fixes #14383. | |||||
* | | | | 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] | |||||
| * | | | | Update callbacks executed on AR::Base#touch [skip ci] | Washington Luiz | 2014-03-14 | 1 | -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-Enumerable | Godfrey Chan | 2014-03-14 | 4 | -12/+40 | |
|\ \ \ \ | | | | | | | | | | | Fix #to_json for BasicObject Enumerables | |||||
| * | | | | 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 | |
|\ \ \ \ | | | | | | | | | | | Allow custom JDBC urls | |||||
| * | | | | better test error messages | schneems | 2014-03-14 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Allow custom JDBC urls | schneems | 2014-03-14 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | mitigates #14323 | |||||
* | | | | | Fix the resolver cache and stop mutating the lookup_context | Rafael Mendonça França | 2014-03-14 | 4 | -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-fix | Rafael Mendonça França | 2014-03-14 | 12 | -33/+130 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | Ensure LookupContext in Digestor selects correct variant | |||||
| * | | | | Introduce #with_formats_and_variants to prevent problems with mutating ↵ | Łukasz Strzałkowski | 2014-03-14 | 4 | -5/+31 | |
| | | | | | | | | | | | | | | | | | | | | finder object | |||||
| * | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | We're setting variant above, in request object directly | |||||
| * | | | | Ensure LookupContext in Digestor selects correct variant | Piotr Chmolowski | 2014-03-09 | 8 | -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 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 | |
| | | | | | | | | | | | | | | | | See https://github.com/rails/sass-rails/issues/191 for more information | |||||
* | | | | 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] | |||||
| * | | | 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. | |||||
| * | | | Make select_all on query cache accept a Relation without binds. | Arthur Neves | 2014-03-13 | 4 | -12/+24 | |
| | | | | | | | | | | | | | | | | | | | | [fixes #14361] [related #13886] | |||||
* | | | | 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`. | |||||
| * | | | | 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 | |
|\ \ \ \ | | | | | | | | | | | Add test for deprecation warning for passing an AR object to `exists?`. | |||||
| * | | | | Test deprecation warning for passing an ActiveRecord object to | Lauro Caetano | 2014-03-13 | 1 | -0/+6 | |
| |/ / / | | | | | | | | | | | | | `exists?` |