Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Minor English fixes in docs [ci skip] | George Millo | 2014-11-17 | 2 | -3/+3 |
| | |||||
* | Merge pull request #17630 from gsamokovarov/exception-wrapper-source-extract | Guillermo Iguaran | 2014-11-16 | 4 | -10/+10 |
|\ | | | | | Rename #source_extract to #source_extracts in ExceptionWrapper | ||||
| * | Rename #source_extract to #source_extracts in ExceptionWrapper | Genadi Samokovarov | 2014-11-16 | 4 | -10/+10 |
| | | | | | | | | | | It returns multiple source extracts since 1ed264bc. Also cleaned its result structure, as we no longer need the file in a code extract. | ||||
* | | Merge pull request #17639 from gsamokovarov/faster-exception-wrapper-traces | Guillermo Iguaran | 2014-11-16 | 1 | -2/+6 |
|\ \ | | | | | | | Don't double check trace origin in ExceptionWrapper#traces | ||||
| * | | Don't double check trace origin in ExceptionWrapper#traces | Genadi Samokovarov | 2014-11-16 | 1 | -2/+6 |
| |/ | | | | | | | | | | | If a trace isn't an application one, then it comes from a framework. That's the definition of framework trace. We can speed up the traces generation if we don't double check that. | ||||
* | | Merge pull request #17638 from gsamokovarov/focus-application-trace | Guillermo Iguaran | 2014-11-16 | 1 | -1/+1 |
|\ \ | | | | | | | Don't show full trace on routing errors | ||||
| * | | Don't show full trace on routing errors | Genadi Samokovarov | 2014-11-16 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | | | | | Since dbcbbcf2bc58e8971672b143d1c52c0244e33f26 the full trace is shown by default on routing errors. While this is a nice feature to have, it does take the attention off the routes table in this view and I think this is what most of the people look for in this page. Added an exception to the default trace switching rule to remove that noise. | ||||
* | | Merge pull request #17637 from gregmolnar/docs | Zachary Scott | 2014-11-16 | 1 | -1/+1 |
|\ \ | |/ |/| | add Nokogiri to docs generation guides [ci skip] | ||||
| * | add Nokogiri to docs generation guides | Greg Molnar | 2014-11-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #17635 from tgxworld/missing_space | Zachary Scott | 2014-11-16 | 1 | -1/+1 |
|\ | | | | | [ci skip] Missing space in Active Job guide for referring to Action Mailer | ||||
| * | [CI SKIP] Missing space. | Guo Xiang Tan | 2014-11-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #17636 from gsamokovarov/exception-wrapper-less-nils | Guillermo Iguaran | 2014-11-16 | 3 | -31/+62 |
|\ \ | |/ |/| | Don't let #{application,framework,full}_trace be nil | ||||
| * | Don't let #{application,framework,full}_trace be nil | Genadi Samokovarov | 2014-11-16 | 3 | -31/+62 |
|/ | | | | | | Those three can be nil when exception backtrace is nil. This happens and that forced a couple of nil guards in the code. I'm proposing to make those always return an array, even on nil backtrace. | ||||
* | Merge pull request #17626 from y-yagi/queue_adapters_doc | Abdelkader Boudih | 2014-11-15 | 1 | -0/+1 |
|\ | | | | | [ci skip] add "Qu" to Backends Features list | ||||
| * | [ci skip] add "Qu" to Backends Features list | yuuji.yaginuma | 2014-11-15 | 1 | -0/+1 |
|/ | |||||
* | Don't freeze the same hash we use for memoization | Sean Griffin | 2014-11-14 | 1 | -6/+7 |
| | |||||
* | Allow `LazyAttributeHash` to be marshalled | Sean Griffin | 2014-11-14 | 1 | -13/+17 |
| | | | | | | | | `default_proc` makes a hash unmarshallable, and adds unneccessary overhead. Since we control all access to the hash, let's just handle it in that method. This has the side effect of improving performance on initialization (but not neccessarily on access). We'll need to profile further once the tests are passing. | ||||
* | Correctly determine if an attribute is uninitialized | Sean Griffin | 2014-11-14 | 2 | -2/+10 |
| | | | | | | | In real usage, we give the builder a types hash with a default value of `Type::Value.new`. This means we need to explicitly check for the key, rather than the truthiness of the type to determine if it's a known but uninitialized attribute | ||||
* | Reduce the amount of work performed when instantiating AR models | Sean Griffin | 2014-11-14 | 6 | -27/+79 |
| | | | | | | | | | | We don't know which attributes will or won't be used, and we don't want to create massive bottlenecks at instantiation. Rather than doing *any* iteration over types and values, we can lazily instantiate the object. The lazy attribute hash should not fully implement hash, or subclass hash at any point in the future. It is not meant to be a replacement, but instead implement its own interface which happens to overlap. | ||||
* | Revert "Improve performance of AR object instantiation" | Sean Griffin | 2014-11-14 | 5 | -61/+11 |
| | | | | | | | | | | This reverts commit 8fee923888192a658d8823b31e77ed0683dfd665. Conflicts: activerecord/lib/active_record/attribute_set/builder.rb This solution sucks, and is hard to actually apply across the board. Going to try other solutions | ||||
* | Merge pull request #17623 from jonatack/patch-8 | Rafael Mendonça França | 2014-11-14 | 1 | -5/+4 |
|\ | | | | | Simplify and fix grammar [ci skip] | ||||
| * | Simplify and fix grammar | Jon Atack | 2014-11-14 | 1 | -5/+4 |
|/ | | | [skip ci] | ||||
* | Merge pull request #17620 from arunagw/aa-build-fix-isolated | Sean Griffin | 2014-11-14 | 30 | -0/+31 |
|\ | | | | | Build fix when running in isolation | ||||
| * | Build fix when running in isolation | Arun Agrawal | 2014-11-14 | 30 | -0/+31 |
| | | | | | | | | | | `Computer` class needs to be require See #17217 for more details | ||||
* | | Use `DelegateClass` instead of `SimpleDelegator` for type decorators | Sean Griffin | 2014-11-14 | 2 | -2/+2 |
| | | | | | | | | There is a significant performance difference between the two. Closes | ||||
* | | Merge pull request #17614 from gsamokovarov/exception-wrapper-basic-tests | Santiago Pastorino | 2014-11-14 | 1 | -0/+66 |
|\ \ | | | | | | | Add basic tests for ActionDispatch::ExceptionWrapper | ||||
| * | | Add basic tests for ActionDispatch::ExceptionWrapper | Genadi Samokovarov | 2014-11-13 | 1 | -0/+66 |
| | | | |||||
* | | | Merge pull request #17619 from tgxworld/fixes_to_testing_guide | Zachary Scott | 2014-11-14 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | [ci skip] Corrections to testing guide. | ||||
| * | | [CI SKIP] Corrections to testing guide. | Guo Xiang Tan | 2014-11-14 | 1 | -2/+2 |
|/ / | | | | | | | Partially revert https://github.com/rails/rails/commit/c31e638a37946a120f6dbf207127d36beea5ab85. | ||||
* | | Merge pull request #17618 from sandipransing/testing-guide | Arun Agrawal | 2014-11-14 | 1 | -4/+2 |
|\ \ | | | | | | | [ci skip] Remove deprecated testing tasks | ||||
| * | | [ci skip] Remove deprecated testing tasks | Sandip Ransing | 2014-11-14 | 1 | -4/+2 |
|/ / | | | | | | | | | This has changed recently and so rake test:all and rake test:all:db are deprecated. | ||||
* | | exec_prepared is GVL friendly, so lets use it. | Aaron Patterson | 2014-11-13 | 2 | -5/+3 |
| | | | | | | | | | | also increase the version of pg required so that people will get the GVL friendly version | ||||
* | | Merge pull request #17613 from sandipransing/testing-guide | Abdelkader Boudih | 2014-11-13 | 1 | -3/+5 |
|\ \ | | | | | | | [ci skip] Improve upon testing tasks guide | ||||
| * | | [ci skip] Improve upon testing tasks guide | Sandip Ransing | 2014-11-14 | 1 | -3/+5 |
|/ / | | | | | | | Add missing testing tasks and also improve upon tasks descriptions | ||||
* | | Merge pull request #17612 from sandipransing/testing-guide | Rafael Mendonça França | 2014-11-13 | 1 | -0/+1 |
|\ \ | | | | | | | [ci skip] Capybara added to other testing approaches | ||||
| * | | [ci skip] Capybara added to other testing approaches | Sandip Ransing | 2014-11-14 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'sandipransing-master' | Zachary Scott | 2014-11-13 | 1 | -2/+6 |
|\ \ | |||||
| * | | [ci skip] Add one more example to routing testing, and highlight association | Sandip Ransing | 2014-11-13 | 1 | -2/+6 |
|/ / | | | | | | | name keywords | ||||
* | | Merge pull request #17604 from rymohr/message-verifier-case-sensitivity | Santiago Pastorino | 2014-11-13 | 1 | -2/+10 |
|\ \ | | | | | | | Abstract encoding strategy for ActiveSupport::MessageVerifier | ||||
| * | | Abstract encoding strategy for ActiveSupport::MessageVerifier | Ryan Mohr | 2014-11-12 | 1 | -2/+10 |
|/ / | |||||
* | | Improve railties changelog entry and move latest to the top [ci skip] | Carlos Antonio da Silva | 2014-11-12 | 1 | -8/+7 |
| | | |||||
* | | Merge pull request #17593 from igas/paths-unshift-arity | Rafael Mendonça França | 2014-11-12 | 2 | -2/+7 |
|\ \ | | | | | | | Fix Rails::Paths::Path.unshift interface | ||||
| * | | Fix Rails::Paths::Path.unshift interface | Igor Kapkov | 2014-11-12 | 2 | -2/+7 |
| | | | |||||
* | | | Merge pull request #17596 from aderyabin/follow_convension | Rafael Mendonça França | 2014-11-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Follow the coding conventions | ||||
| * | | | Follow the coding conventions | Andrey Deryabin | 2014-11-12 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #17348 from DavidGeukers/rake_test_all | David Heinemeier Hansson | 2014-11-12 | 3 | -6/+28 |
|\ \ \ | |/ / |/| | | simplify rake test vs rake test:all | ||||
| * | | Simplify rake test vs rake test:all | David Geukers | 2014-11-10 | 3 | -6/+28 |
| | | | | | | | | | | | | Renames `rake test:all` to `rake test` by changing old `rake test:run` to previous version of `rake test:all`. Removes old definition of `rake test`. Also renames `rake test:all:db` to `rake test:db` and deprecates `rake test:all` & `rake test:all:db` | ||||
* | | | Merge pull request #17588 from djpowers/patch-1 | Zachary Scott | 2014-11-11 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | [ci skip] Use American English and replace "behaviour" with "behavior". | ||||
| * | | | Replace "behaviour" with "behavior" | Dave Powers | 2014-11-11 | 1 | -2/+2 |
|/ / / | | | | | | | Update to consistently use American English [ci skip] | ||||
* | | | Merge pull request #17047 from betesh/master | Rafael Mendonça França | 2014-11-11 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Time includes DateAndTime::Zones acts_like(:time) |