aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23660 from meinac/change_x_gzip_to_gzipJon Moss2016-02-132-3/+3
|\ | | | | Change x-gzip to gzip in docs [ci skip]
| * Change x-gzip to gzip in docs [ci skip]Mehmet Emin İNAÇ2016-02-132-3/+3
| | | | | | | | For more information about GNU zip mime type please check IETF's web site [RFC6713](http://tools.ietf.org/html/rfc6713) or [IANA](http://www.iana.org/assignments/media-types/media-types.xhtml#application)
* | Merge pull request #23377 from bogdan/last-with-sqlEileen M. Uchitelle2016-02-134-17/+78
|\ \ | | | | | | Fix AR::Relation#last bugs instroduced in 7705fc
| * | Make ActiveRecord::Relation#last to reverse SQL orderBogdan Gusiev2016-02-134-17/+78
| | | | | | | | | | | | instead of loading the relation into memory
* | | Merge pull request #23654 from kamipo/fix_grammar_a_to_anJon Moss2016-02-1314-14/+14
|\ \ \ | |_|/ |/| | Fix grammar `a` to `an` [ci skip]
| * | Fix grammar `a` to `an` [ci skip]Ryuta Kamizono2016-02-1314-14/+14
| | |
* | | Merge pull request #23655 from y-yagi/add_missing_option_to_exampleKasper Timm Hansen2016-02-131-2/+2
|\ \ \ | |/ / |/| | add missing name option to flash test example [ci skip]
| * | add missing name option to flash test example [ci skip]yuuji.yaginuma2016-02-131-2/+2
| | |
* | | Merge pull request #23653 from kamipo/add_missing_author_nameVipul A M2016-02-131-0/+2
|\ \ \ | | | | | | | | Add the missing author name [ci skip]
| * | | Add the missing author name [ci skip]Ryuta Kamizono2016-02-131-0/+2
|/ / / | | | | | | | | | The author name was lost in the merge commit 6fedc7d.
* / / push kwargs up to the user facing APIAaron Patterson2016-02-123-13/+13
|/ / | | | | | | | | | | | | this lets us leverage Ruby's kwarg handling (exceptions for missing params, etc) ASAP which allows us to skip active support method calls and make sure the exception stack is closer to where the user called the methods.
* | Fix expected hash syntax.Kasper Timm Hansen2016-02-121-3/+3
| | | | | | | | | | | | 3f70e8bd2 set a new bar for tests, but they weren't updated. Update their expectation.
* | Prefer empty? to any?.Kasper Timm Hansen2016-02-121-1/+1
| | | | | | | | | | | | | | If the collection isn't empty any? will loop through it. Spare the loop and be more concise with what we're asking the collection about.
* | Stop mutating return value.Kasper Timm Hansen2016-02-121-2/+3
| | | | | | | | | | | | `PartialRenderer.render_collection_with/without_template` returns an array of rendered partials. Avoid dup'ing and shifting it by indexing into the collection instead.
* | Inline `fetch_or_cache_partial`.Kasper Timm Hansen2016-02-121-10/+6
| | | | | | | | Wasn't pulling its weight for a simple yield anymore.
* | Write to collection cache where the template is rendered.Kasper Timm Hansen2016-02-122-9/+15
|/ | | | | | | | Moves us closer to having access to a local template variable, we can ask for eligibility and its virtual_path. Currently we rely on `@template`, which we don't have available when rendering collections without a fixed template.
* Only write to collection cache if we have a callable cache key.Kasper Timm Hansen2016-02-122-16/+13
| | | | | | | | | | | A callable cache key writes to the collection cache under a certain namespace. Which means if we don't have scoped cache key we can just rely on the `cache model_name do` in the templates to cache them. Less writes, more sharing. Add `assert_customer_cached` to better illustrate this in tests, and remove tests which then don't communicate as much.
* Check `partial_rendered_times` to clarify expectations.Kasper Timm Hansen2016-02-121-1/+4
| | | | | It was difficult to see when the partials were rendered, and how many times we expected it to be rendered before. Because we weren't explaining it.
* Use Ruby 1.9 hash syntaxRafael Mendonça França2016-02-121-1/+1
|
* Remove useless callable_cache_key? check.Kasper Timm Hansen2016-02-121-2/+1
| | | | | | `automatic_cache_eligible?´ is only called if there was no `:cache` key to fetch in the `@options` via `cache_collection?`. So the check will always be false.
* Test collection caching with callable cache key.Kasper Timm Hansen2016-02-121-0/+25
| | | | | | | When people pass `cache: -> item { item.upcase }` they scope the collection cache keys so the individual partial cache isn't reused. Test that behavior.
* the lookup context looks in the cwd, so prefix isn't necessaryAaron Patterson2016-02-121-2/+1
|
* use a real LookupContext in the digest testsAaron Patterson2016-02-121-28/+6
| | | | | This will ensure that the digestor stays in parity with the LookupContext object.
* Remove single_template_render? method.Kasper Timm Hansen2016-02-121-5/+1
| | | | | | Written when I didn't understand the internals as well. Action View generally just refers to `@template` when meaning a fixed template render. So follow that implicit convention.
* Don't search in locals for cache_options.Kasper Timm Hansen2016-02-121-3/+1
| | | | | | We should only support a top level `cache_options`. We also don't have to default the options to a hash as Active Support's cache defaults that arg to nil.
* use assert_not_equal so there will be better error messagesAaron Patterson2016-02-121-1/+1
| | | | in the case of failure it is nice to see what the two digests are.
* use kwargs to avoid hash slicingAaron Patterson2016-02-121-3/+3
| | | | | we can use kwargs in this case to avoid values_at and except calls on the options hash
* Merge pull request #23611 from abhishekjain16/routes_optionsKasper Timm Hansen2016-02-122-3/+12
|\ | | | | Fix routes to match verb and URL path with -g option also.
| * Fixes routes to match verbs and path with -g optionAbhishek Jain2016-02-112-3/+12
| |
* | Add fixes accidentally removed.Kasper Timm Hansen2016-02-123-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Yesterday, when improving how `parsed_body` extracted a parser I wrote 77bbf1e. Then I thought that was too many changes in one commit and broke it up locally... or so I thought. When pushed the extra commits removed the changes! Wups! In shame, lob those changes together here: * 3b94c38 which meant to fix the CHANGELOG syntax error. * 5007df5 which meant to mention `parsed_body` in the docs. * 036a7a0 which meant to memoize the `parsed_body`.
* | Flesh out request encoding + response parsing changelog entry.Kasper Timm Hansen2016-02-121-2/+11
| | | | | | | | | | | | | | Add more info about the APIs added and how they work. Use string keys when comparing the parsed response, like how JSON would be parsed.
* | Merge pull request #23642 from tvon/chore/fix-path-omissionVipul A M2016-02-133-3/+3
|\ \ | | | | | | Fix 'config/production.rb' path in comment
| * | Use correct path in documentation.Tom von Schwerdtner2016-02-123-3/+3
| | | | | | | | | | | | | | | | | | s/config\/production/config\/environments\/production/ [ci skip]
* | | Merge pull request #23641 from abhishekjain16/docs_fixVipul A M2016-02-123-3/+3
|\ \ \ | |/ / |/| | [ci skip] Fix enqueuing spelling to maintain consistency
| * | [ci skip] Fix enqueuing spelling to maintain consistencyAbhishek Jain2016-02-123-3/+3
|/ /
* | Merge pull request #23639 from Gaurav2728/update_change_log_entry_action_packRafael França2016-02-122-3/+3
|\ \ | | | | | | use rails instead of rake [ci skip]
| * | use rails instead of rakeGaurav Sharma2016-02-122-3/+3
|/ / | | | | since starting with Rails 5.x(beta) we prefer to use rails as the replacement of rake commands, may be change log will be the same
* | Merge pull request #23633 from maclover7/sec-releasingJon Moss2016-02-121-1/+1
|\ \ | | | | | | Update RELEASING_RAILS.md
| * | Update RELEASING_RAILS.mdJon Moss2016-02-121-1/+1
|/ / | | | | | | | | | | Koz is in alumni now, replaced him with rafaelfranca. [ci skip]
* | Merge pull request #23612 from vipulnsward/23561-fix-routes-argsKasper Timm Hansen2016-02-124-12/+10
|\ \ | | | | | | Fix argument passing to rake routes
| * | - Fixed and removed long arguments to rake routesVipul A M2016-02-124-12/+10
| | | | | | | | | | | | | | | | | | - Fixed related documentation and usage all around Fixes #23561
* | | Merge pull request #23629 from prathamesh-sonpatki/fix-numbersप्रथमेश Sonpatki2016-02-121-3/+3
|\ \ \ | | | | | | | | Fix numbers of steps to upgrade Rails [ci skip]
| * | | Fix numbers of steps to upgrade Rails [ci skip]Prathamesh Sonpatki2016-02-121-3/+3
|/ / /
* | | remove detail initialization metaprogrammingAaron Patterson2016-02-111-8/+12
| | | | | | | | | | | | | | | | | | This metaprogrammed method doesn't seem to be a bottleneck, so lets just use a regular method so it's easier to understand. We can follow up with more interesting techniques for cache manipulation soon.
* | | Merge pull request #23618 from hashbangnz/document-upgrade-processJon Moss2016-02-111-0/+15
|\ \ \ | | | | | | | | Document the upgrade process
| * | | Improve wording in documentation changeLeslie Viljoen2016-02-121-3/+3
| | | | | | | | | | | | | | | | [ci skip]
| * | | Document the upgrade processLeslie Viljoen2016-02-121-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iterative process one has to follow is not currently documented, and people could be unfamiliar with the Rails versioning scheme, causing them to skip versions or upgrade to patch releases. [ci skip]
* | | | Merge pull request #23546 from maclover7/cable-readme-updateJon Moss2016-02-111-8/+7
|\ \ \ \ | | | | | | | | | | ActionCable README updates
| * | | | ActionCable README updatesJon Moss2016-02-081-8/+7
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Memoize `parsed_body`.Kasper Timm Hansen2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's common to use several assertions on the parsed response. The response bodies aren't meant to be mutated. People should make new test requests instead. Thus, it should be safe to memoize the parsing.