Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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?` | ||||
* / / | require actions rather than create_file | Aaron Patterson | 2014-03-13 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319 | ||||
* | | passing an instance of an AR object to `find` is deprecated | Aaron Patterson | 2014-03-13 | 5 | -6/+13 |
| | | | | | | | | please pass the id of the AR object by calling `.id` on the model first. | ||||
* | | passing an ActiveRecord object to `exists?` is deprecated. | Aaron Patterson | 2014-03-13 | 5 | -4/+14 |
| | | | | | | | | | | Pass the id of the object to the method by calling `.id` on the AR object. | ||||
* | | make tests pass on Ruby 2.2 | Aaron Patterson | 2014-03-13 | 2 | -5/+5 |
| | | | | | | | | | | | | Apparently we've been using a buggy feature for the past 6 years: https://bugs.ruby-lang.org/issues/9593 | ||||
* | | Use Sqlite3 adapter in examples | Julian Simioni | 2014-03-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two bits of example code use sqlite as an adapter, which doesn't exist. Using the code verbatim will raise a LoadError exception: ActiveRecord::Base.establish_connection( "adapter" => "sqlite", "database" => "db.sqlite" ) # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'... Considering this is code a lot of people new to Rails might be running, it's especially confusing. Closes #14367 [ci skip] | ||||
* | | use the body proxy to freeze headers | Aaron Patterson | 2014-03-12 | 5 | -12/+57 |
| | | | | | | | | | | | | avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header | ||||
* | | just ask the response for the commit status, we do not need to ask the jar | Aaron Patterson | 2014-03-12 | 1 | -1/+1 |
| | | |||||
* | | only write the jar if the response isn't committed | Aaron Patterson | 2014-03-12 | 6 | -10/+57 |
| | | | | | | | | | | | | | | | | | | | | | | when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352 | ||||
* | | Merge pull request #14366 from sukolsak/grammar | Lauro Caetano | 2014-03-12 | 1 | -1/+1 |
|\ \ | | | | | | | Fix a grammatical error in the i18n guide | ||||
| * | | Fix a grammatical error in the i18n guide [ci skip] | sukolsak | 2014-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #14364 from why-el/better-docs-for-update-attribute | Arthur Nogueira Neves | 2014-03-12 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Enhance docs for update_attribute [skip ci] | ||||
| * | | Enhance docs for update_attribute [ci-skip] | Mohamed Wael Khobalatte | 2014-03-12 | 1 | -0/+2 |
| | | | |||||
* | | | use method_defined? to check whether or not a method is defined | Aaron Patterson | 2014-03-12 | 1 | -1/+1 |
| | | |