aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix NoMethodError preparable for Arel::Visitors in case prepared statements ↵Azzurrio2016-02-222-1/+23
| | | | is falsy
* 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.
* | | | | [ci skip] Mention `parsed_body` in docs.Kasper Timm Hansen2016-02-111-2/+1
| | | | | | | | | | | | | | | | | | | | Little easier to understand when you know the method that's used.
* | | | | [ci skip] Fix syntax error in CHANGELOG example.Kasper Timm Hansen2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | Can't code for shit.
* | | | | Make `parsed_body` extract parser from the content type.Kasper Timm Hansen2016-02-114-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're not guaranteed to have a `RequestEncoder` to assign on `get` requests because we aren't extracting the parser from the response content type. Until now.
* | | | | Don't capture the MissingTemplate exception.Kasper Timm Hansen2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | Wasn't removed in 57ac777.
* | | | | Oops. :cut:Aaron Patterson2016-02-111-6/+0
| | | | |
* | | | | follow indentation rulesAaron Patterson2016-02-111-5/+11
| | | | |
* | | | | make the logger method always return somethingAaron Patterson2016-02-111-4/+9
| | | | | | | | | | | | | | | | | | | | then we can stop scattering nil checks (e.g. `try`) through the class.
* | | | | Merge pull request #18109 from k0kubun/unscoped-joinsSean Griffin2016-02-114-6/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow `joins` to be unscoped Fixes #13775
| * | | | | Allow `joins` to be unscopedTakashi Kokubun2016-01-314-6/+31
| | | | | |
* | | | | | Merge pull request #23581 from diego-silva/uniqueness-validator-pk-fixSean Griffin2016-02-112-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | UniquenessValidator exclude itself when PK changed
| * | | | | | UniquenessValidator exclude itself when PK changedDiego Silva2016-02-092-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing the PK for a record which has a uniqueness validation on some other attribute, Active Record should exclude itself from the validation based on the PK value stored on the DB (id_was) instead of its new value (id).
* | | | | | | Ensure prepared statement caching still occurs with Adequate RecordSean Griffin2016-02-114-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5, we're much more restrictive about when we do or don't cache a prepared statement. In particular, we never cache when we are sending an IN statement or a SQL string literal However, in the case of Adequate Record, we are *always* sending a raw SQL string, and we *always* want to cache the result. Fixes #23507 /cc @tgxworld
* | | | | | | Merge pull request #23605 from y-yagi/remove_warnings_in_finder_methodsKasper Timm Hansen2016-02-111-4/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | remove warnings from FinderMethods
| * | | | | | remove warnings from FinderMethodsyuuji.yaginuma2016-02-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warnings. ``` activerecord/lib/active_record/relation/finder_methods.rb:252: warning: ambiguous first argument; put parentheses or a space even after `-' operator activerecord/lib/active_record/relation/finder_methods.rb:258: warning: ambiguous first argument; put parentheses or a space even after `-' operator activerecord/lib/active_record/relation/finder_methods.rb:268: warning: ambiguous first argument; put parentheses or a space even after `-' operator activerecord/lib/active_record/relation/finder_methods.rb:274: warning: ambiguous first argument; put parentheses or a space even after `-' operator ```
* | | | | | | Merge pull request #23604 from tenderlove/sort-templatesAaron Patterson2016-02-101-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | sort templates after looking them up in the from the paths cache
| * | | | | | | sort templates after looking them up in the from the paths cacheAaron Patterson2016-02-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The view paths cache will eventually query the filesystem when looking up templates: https://github.com/rails/rails/blob/2db347bebc9d3f39b3c5e274b7c9beecfce73913/actionview/lib/action_view/template/resolver.rb#L224-L230 The order in which files are returned is file system dependent. Since the template digest [depends on its children](https://github.com/rails/rails/blob/2db347bebc9d3f39b3c5e274b7c9beecfce73913/actionview/lib/action_view/digestor.rb#L109-L115), the order of the dependencies will impact the fingerprint. This commit sorts the wildcard dependencies so that we get a consistent hash. Fixes #23592
* | | | | | | | Merge pull request #23606 from supremebeing7/patch-1Jon Moss2016-02-101-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update active_record_querying.md
| * | | | | | | | Update active_record_querying.mdMark J. Lehman2016-02-101-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added important distinction between scopes and class methods.
* | | | | | | | | Merge pull request #23596 from afn/issue-23058Aaron Patterson2016-02-102-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Converting backtrace to strings before calling set_backtrace
| * | | | | | | | Converting backtrace to strings before calling set_backtraceTony Novak2016-02-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23058