aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
|/ / /
* | | Improve railties changelog entry and move latest to the top [ci skip]Carlos Antonio da Silva2014-11-121-8/+7
| | |
* | | Merge pull request #17593 from igas/paths-unshift-arityRafael Mendonça França2014-11-122-2/+7
|\ \ \ | | | | | | | | Fix Rails::Paths::Path.unshift interface
| * | | Fix Rails::Paths::Path.unshift interfaceIgor Kapkov2014-11-122-2/+7
| | | |
* | | | Merge pull request #17596 from aderyabin/follow_convensionRafael Mendonça França2014-11-121-1/+1
|\ \ \ \ | |_|_|/ |/| | | Follow the coding conventions
| * | | Follow the coding conventionsAndrey Deryabin2014-11-121-1/+1
|/ / /
* | | Merge pull request #17348 from DavidGeukers/rake_test_allDavid Heinemeier Hansson2014-11-123-6/+28
|\ \ \ | |/ / |/| | simplify rake test vs rake test:all
| * | Simplify rake test vs rake test:allDavid Geukers2014-11-103-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-1Zachary Scott2014-11-111-2/+2
|\ \ \ | | | | | | | | [ci skip] Use American English and replace "behaviour" with "behavior".
| * | | Replace "behaviour" with "behavior"Dave Powers2014-11-111-2/+2
|/ / / | | | | | | Update to consistently use American English [ci skip]
* | | Merge pull request #17047 from betesh/masterRafael Mendonça França2014-11-111-0/+1
|\ \ \ | | | | | | | | Time includes DateAndTime::Zones acts_like(:time)
| * | | Time includes DateAndTime::Zones acts_like(:time)betesh2014-11-091-0/+1
| | | |
* | | | Merge pull request #17580 from ccutrer/change_table_nameYves Senn2014-11-113-17/+29
|\ \ \ \ | | | | | | | | | | | | | | | add a Table#name accessor like TableDefinition#name
| * | | | add a Table#name accessor like TableDefinition#nameCody Cutrer2014-11-103-17/+29
| | | | |
* | | | | Make FlashHash#key? work with symbol and stringRafael Mendonça França2014-11-112-1/+10
| | | | | | | | | | | | | | | | | | | | Closes #17586
* | | | | Remove unnecessary double spaceclaudiob2014-11-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the following in two places: ```diff -require ::File.expand_path('../config/environment', __FILE__) +require ::File.expand_path('../config/environment', __FILE__) ```
* | | | | Merge branch 'rm-fix-secret-token-fallback'Rafael Mendonça França2014-11-109-23/+143
|\ \ \ \ \
| * | | | | :scissors:Rafael Mendonça França2014-11-101-1/+1
| | | | | |
| * | | | | No need to sync config.secret_token and secrets.secret_tokenRafael Mendonça França2014-11-102-41/+4
| | | | | | | | | | | | | | | | | | | | | | | | Just prefer secrets over config
| * | | | | Merge pull request #16535 from bf4/patch-1Rafael Mendonça França2014-11-109-23/+180
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Allow fallback to LegacyKeyGenerator when secret_key_base is not set but secrets.secret_token is
| | * | | | `secret_token` is now saved in `Rails.application.secrets.secret_token`Benjamin Fleischer2014-11-029-23/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `secrets.secret_token` is now used in all places `config.secret_token` was - `secrets.secret_token`, when not present in `config/secrets.yml`, now falls back to the value of `config.secret_token` - when `secrets.secret_token` is set, it over-writes `config.secret_token` so they are the same (for backwards-compatibility) - Update docs to reference app.secrets in all places - Remove references to `config.secret_token`, `config.secret_key_base` - Warn that missing secret_key_base is deprecated - Add tests for secret_token, key_generator, and message_verifier - the legacy key generator is used with the message verifier when secrets.secret_key_base is blank and secret_token is set - app.key_generator raises when neither secrets.secret_key_base nor secret_token are set - app.env_config raises when neither secrets.secret_key_base nor secret_token are set - Add changelog Run focused tests via ruby -w -Itest test/application/configuration_test.rb -n '/secret_|key_/'
* | | | | | dependencies.rb: keep the decorated #load and #require private [closes #17553]Xavier Noria2014-11-103-13/+36
| | | | | |
* | | | | | Merge pull request #17585 from aderyabin/remove_limited_update_conditionsRafael Mendonça França2014-11-102-8/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | remove never called method `limited_update_conditions`