aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix random failures of tests on TravisPrathamesh Sonpatki2016-02-121-1/+1
| | | | | | | | | | - Tests on Travis are randomly failing because schema_migrations table does not exist in teardown block. - Also checked that all other places where we have used `ActiveRecord::SchemaMigration.delete_all` we have rescued it, so used it here also. This failure was not specifically related to the test added in this PR but to overall compatibility migration tests, so adding as separate commit.
* Correctly show deprecation warning for incompatible migrationsPrathamesh Sonpatki2016-02-122-1/+13
|
* 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
* | | | | | | Merge pull request #23395 from PareshGupta/remove-unused-constantSantiago Pastorino2016-02-103-54/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Remove unused ReaderMethodCache and WriterMethodCache constants from ActiveRecord
| * | | | | | Remove unused class AttributeMethodCachePareshGupta2016-02-022-25/+0
| | | | | | |
| * | | | | | remove unused constants from activerecordPareshGupta2016-02-012-30/+6
| | | | | | |
* | | | | | | check `supports_view_paths?` at registration timeAaron Patterson2016-02-101-7/+9
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we check the conditional at registration time, then we can avoid the conditional at runtime. This commit checks for view path support when the handler is registered so that runtime calls to `find_dependencies` won't need to check the conditional. The idea is that `register_tracker` is called only once where `find_dependencies` may be called many times.
* | | | | | build scope chain functionally and remove cachingAaron Patterson2016-02-101-14/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit walks the reflection tree and builds the scope chain functionally. It also removes the chain cache since the cache doesn't seem to have any impact on performance (I'd prefer to only cache at proven bottlenecks)
* | | | | | Merge pull request #23597 from kaspth/integration-response-parsingKasper Timm Hansen2016-02-104-23/+94
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `response.parsed_body` to Integration Tests
| * | | | | | Add request encoding and response parsing to changelog.Kasper Timm Hansen2016-02-101-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to add this in the original pull request. No biggie, just show some examples.
| * | | | | | Add `parsed_body` to spare writing out parsing routines.Kasper Timm Hansen2016-02-103-23/+56
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing: ```ruby post articles_path, params: { article: { title: 'Ahoy!' } }, as: :json ``` It's common to want to make assertions on the response body. Perhaps the server responded with JSON, so you write `JSON.parse(response.body)`. But that gets tedious real quick. Instead add `parsed_body` which will automatically parse the reponse body as what the last request was encoded `as`.
* | | | | | Merge pull request #23528 from bensheldon/patch-1Richard Schneeman2016-02-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Set database poolsize via rails_max_threads
| * | | | | | Set postgresql poolsize via RAILS_MAX_THREADSBen Sheldon2016-02-101-1/+1
| | | | | | |
* | | | | | | Merge pull request #23274 from KeithP/actioncable_loggingDavid Heinemeier Hansson2016-02-101-2/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | adds debug logging to actioncable connect
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into actioncable_loggingkp2016-02-10258-1531/+3186
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Logs successful and invalid connections separatelykp2016-02-101-8/+12
| | | | | | | |
| * | | | | | | adds debug logging to actioncable connectkp2016-01-261-2/+12
| | | | | | | |
* | | | | | | | Merge pull request #23583 from brchristian/penultimateDavid Heinemeier Hansson2016-02-1010-2/+86
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Array.second_to_last and Array.third_to_last access methods
| * | | | | | | include activerecord and activesupport CHANGELOG entriesBrian Christian2016-02-102-0/+8
| | | | | | | |
| * | | | | | | rename to 'second_to_last' and 'third_to_last'Brian Christian2016-02-108-32/+32
| | | | | | | |
| * | | | | | | allow Array.penultimate and Array.antepenultiate access methodsBrian Christian2016-02-098-2/+78
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #21671 from kaspth/integration-request-encoding-helpersDavid Heinemeier Hansson2016-02-102-4/+122
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add `as` to encode a request as a specific mime type.