aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #17640 from michaeljayt/spring-not-working-in-cygwinRafael Mendonça França2014-11-171-1/+1
|\ \ \ | | | | | | | | Skip spring install in Cygwin due to fork() bad support.
| * | | Skip spring install in Cygwin due to fork() bad support.michaeljayt2014-11-171-1/+1
| | | | | | | | | | | | | | | | See also: https://www.cygwin.com/faq.html#faq.using.fixing-fork-failures
* | | | Merge pull request #17642 from tgxworld/fix_template_assertion_on_assignsRafael Mendonça França2014-11-172-4/+20
|\ \ \ \ | | | | | | | | | | Fix for assigns(:..) resetting template assertions
| * | | | Fix for assigns(:..) resetting template assertionsCalvin Correli2014-11-172-4/+20
| | | | | | | | | | | | | | | | | | | | When calling assigns(:...) or cookies(:...), template assertions would be reset, which they obviously shouldn't be.
* | | | | Merge pull request #17628 from bf4/update_unicodeRafael Mendonça França2014-11-172-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update to Unicode 7.0.0
| * | | | | Update to Unicode 7.0.0Benjamin Fleischer2014-11-152-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7.0.0 was released on June 16, 2014 http://unicode-inc.blogspot.com.ar/2014/10/unicode-version-70-complete-text-of.html ruby bin/generate_tables
* | | | | | Merge pull request #17645 from georgemillo/masterRafael Mendonça França2014-11-172-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Minor English fixes in docs [ci skip]
| * | | | | | Minor English fixes in docs [ci skip]George Millo2014-11-172-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Meant to describe the concept, not the setting [ci skip]Godfrey Chan2014-11-171-1/+1
| | | | | |
* | | | | | Deprecate different default for `log_level` in productionGodfrey Chan2014-11-173-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a more conservative approach to 2602a49. Also changed the comment to be more inline with everything else in the file (describing what the config value is doing and why). People should just read the docs for alternatives.
* | | | | | Revert "Merge pull request #16622 from matthewd/default-debug"Godfrey Chan2014-11-172-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2602a49a8600ab52f807599bbd5b1f9c0be4214f, reversing changes made to 5d7c1057684c377bc2801c8851e99ff11ab23530. The explicit default was introduced in 21f6d72, so apps created with Rails < 4 have the commented out version, which means that this change would break those apps.
* | | | | Merge pull request #17630 from gsamokovarov/exception-wrapper-source-extractGuillermo Iguaran2014-11-164-10/+10
|\ \ \ \ \ | | | | | | | | | | | | Rename #source_extract to #source_extracts in ExceptionWrapper
| * | | | | Rename #source_extract to #source_extracts in ExceptionWrapperGenadi Samokovarov2014-11-164-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-tracesGuillermo Iguaran2014-11-161-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't double check trace origin in ExceptionWrapper#traces
| * | | | | | Don't double check trace origin in ExceptionWrapper#tracesGenadi Samokovarov2014-11-161-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-traceGuillermo Iguaran2014-11-161-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Don't show full trace on routing errors
| * | | | | Don't show full trace on routing errorsGenadi Samokovarov2014-11-161-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/docsZachary Scott2014-11-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | add Nokogiri to docs generation guides [ci skip]
| * | | | add Nokogiri to docs generation guidesGreg Molnar2014-11-161-1/+1
|/ / / /
* | | | Merge pull request #17635 from tgxworld/missing_spaceZachary Scott2014-11-161-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Missing space in Active Job guide for referring to Action Mailer
| * | | | [CI SKIP] Missing space.Guo Xiang Tan2014-11-161-1/+1
| |/ / /
* | | | Merge pull request #17636 from gsamokovarov/exception-wrapper-less-nilsGuillermo Iguaran2014-11-163-31/+62
|\ \ \ \ | |/ / / |/| | | Don't let #{application,framework,full}_trace be nil
| * | | Don't let #{application,framework,full}_trace be nilGenadi Samokovarov2014-11-163-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_docAbdelkader Boudih2014-11-151-0/+1
|\ \ \ | | | | | | | | [ci skip] add "Qu" to Backends Features list
| * | | [ci skip] add "Qu" to Backends Features listyuuji.yaginuma2014-11-151-0/+1
|/ / /
* | | Don't freeze the same hash we use for memoizationSean Griffin2014-11-141-6/+7
| | |
* | | Allow `LazyAttributeHash` to be marshalledSean Griffin2014-11-141-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 uninitializedSean Griffin2014-11-142-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 modelsSean Griffin2014-11-146-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 Griffin2014-11-145-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-8Rafael Mendonça França2014-11-141-5/+4
|\ \ \ | | | | | | | | Simplify and fix grammar [ci skip]
| * | | Simplify and fix grammarJon Atack2014-11-141-5/+4
|/ / / | | | | | | [skip ci]
* | | Merge pull request #17620 from arunagw/aa-build-fix-isolatedSean Griffin2014-11-1430-0/+31
|\ \ \ | | | | | | | | Build fix when running in isolation
| * | | Build fix when running in isolationArun Agrawal2014-11-1430-0/+31
| | | | | | | | | | | | | | | | | | | | `Computer` class needs to be require See #17217 for more details
* | | | Use `DelegateClass` instead of `SimpleDelegator` for type decoratorsSean Griffin2014-11-142-2/+2
| | | | | | | | | | | | | | | | There is a significant performance difference between the two. Closes
* | | | Merge pull request #17614 from gsamokovarov/exception-wrapper-basic-testsSantiago Pastorino2014-11-141-0/+66
|\ \ \ \ | | | | | | | | | | Add basic tests for ActionDispatch::ExceptionWrapper
| * | | | Add basic tests for ActionDispatch::ExceptionWrapperGenadi Samokovarov2014-11-131-0/+66
| | | | |
* | | | | Merge pull request #17619 from tgxworld/fixes_to_testing_guideZachary Scott2014-11-141-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | [ci skip] Corrections to testing guide.
| * | | | [CI SKIP] Corrections to testing guide.Guo Xiang Tan2014-11-141-2/+2
|/ / / / | | | | | | | | | | | | Partially revert https://github.com/rails/rails/commit/c31e638a37946a120f6dbf207127d36beea5ab85.
* | | | Merge pull request #17618 from sandipransing/testing-guideArun Agrawal2014-11-141-4/+2
|\ \ \ \ | | | | | | | | | | [ci skip] Remove deprecated testing tasks
| * | | | [ci skip] Remove deprecated testing tasksSandip Ransing2014-11-141-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 Patterson2014-11-132-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-guideAbdelkader Boudih2014-11-131-3/+5
|\ \ \ \ | | | | | | | | | | [ci skip] Improve upon testing tasks guide
| * | | | [ci skip] Improve upon testing tasks guideSandip Ransing2014-11-141-3/+5
|/ / / / | | | | | | | | | | | | Add missing testing tasks and also improve upon tasks descriptions
* | | | Merge pull request #17612 from sandipransing/testing-guideRafael Mendonça França2014-11-131-0/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Capybara added to other testing approaches
| * | | | [ci skip] Capybara added to other testing approachesSandip Ransing2014-11-141-0/+1
|/ / / /
* | | | Merge branch 'sandipransing-master'Zachary Scott2014-11-131-2/+6
|\ \ \ \
| * | | | [ci skip] Add one more example to routing testing, and highlight associationSandip Ransing2014-11-131-2/+6
|/ / / / | | | | | | | | | | | | name keywords
* | | | Merge pull request #17604 from rymohr/message-verifier-case-sensitivitySantiago Pastorino2014-11-131-2/+10
|\ \ \ \ | | | | | | | | | | Abstract encoding strategy for ActiveSupport::MessageVerifier
| * | | | Abstract encoding strategy for ActiveSupport::MessageVerifierRyan Mohr2014-11-121-2/+10
|/ / / /