aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #9713 from imanel/live_staleAaron Patterson2013-03-142-0/+19
|\ \ \ \ \ | |_|/ / / |/| | | | Handle conditional get in live requests
| * | | | Handle conditional get in live requests - this will prevent error when using ↵Bernard Potocki2013-03-142-0/+19
|/ / / / | | | | | | | | | | | | stale on live streams(issue #9636)
* | | | Merge pull request #9711 from vipulnsward/moar_cleanupsSteve Klabnik2013-03-134-6/+5
|\ \ \ \ | | | | | | | | | | MOAR cleanups of unused variables.
| * | | | MOAR cleanups.Vipul A M2013-03-144-6/+5
|/ / / /
* | | | Add extra clarifying line in docs. [ci skip]Steve Klabnik2013-03-131-0/+1
| | | |
* | | | Fix docs: response -> request.Steve Klabnik2013-03-131-2/+2
| | | | | | | | | | | | | | | | Even though I read it carefully, my brain tricked me. :cry:
* | | | Merge pull request #9698 from garethrees/request_documentationSteve Klabnik2013-03-131-0/+16
|\ \ \ \ | | | | | | | | | | Add documentation to ActionDispatch::Request
| * | | | Add documentation to ActionDispatch::RequestGareth Rees2013-03-131-0/+16
| | | | |
* | | | | Merge pull request #9690 from trevorturk/upgrade-notesRafael Mendonça França2013-03-131-0/+26
|\ \ \ \ \ | | | | | | | | | | | | Rails 4 upgrade notes about clashing named route selection changes
| * | | | | Document change to clashing named route selection from journey commit 98a9802aTrevor Turk2013-03-121-0/+26
| | | | | |
* | | | | | Merge pull request #9699 from rubys/scaffold_password_digestCarlos Antonio da Silva2013-03-1311-14/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for generate scaffold password:digest * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture
| * | | | | | Add support for generate scaffold password:digestSam Ruby2013-03-1311-14/+90
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password entirely from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture
* | | | | | Move some railties changelog entries to the top [ci skip]Carlos Antonio da Silva2013-03-131-20/+21
| | | | | |
* | | | | | Merge pull request #9700 from senny/6513_integration_test_headersAndrew White2013-03-135-65/+206
|\ \ \ \ \ \ | | | | | | | | | | | | | | rework passing headers and env variables in integration tests
| * | | | | | `Http::Headers` respects dotted env vars, symbols, headers with numbers.Yves Senn2013-03-132-11/+33
| | | | | | |
| * | | | | | allow headers and env to be passed in `IntegrationTest`.Yves Senn2013-03-135-36/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #6513.
| * | | | | | refactor, `Http::Headers` stores headers in env notationYves Senn2013-03-132-29/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: cleanup, use consistent syntax for `Http::Header` and test.
| * | | | | | Http::Headers respects headers that are not prefixed with HTTP_Yves Senn2013-03-133-7/+30
|/ / / / / /
* | | | | | Merge pull request #9694 from ↵Carlos Antonio da Silva2013-03-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | vipulnsward/change_from_each_to_each_value_in_http_params Change from each to each_value in http/parameters since we don't use key
| * | | | | Change from each to each_value in http/parameters since we don't use keyVipul A M2013-03-131-1/+1
| | | | | |
* | | | | | Merge pull request #9696 from senny/typo_in_changelogAndrew White2013-03-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typo in Active Record CHANGELOG [ci skip]
| * | | | | | fix typo in Active Record CHANGELOG [ci skip]Yves Senn2013-03-131-1/+1
|/ / / / / /
* | | | | | Add regression tests for #9678Andrew White2013-03-131-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug with `ActiveSupport::TimeZone.parse` described in #9678 was unwittingly fixed in 005d910 so add some tests to prevent regression.
* | | | | | removing out of date comment. ↵Aaron Patterson2013-03-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | :heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart: @pixeltrix
* | | | | | drop memory consumption and startup speed by switching to define_methodAaron Patterson2013-03-121-23/+28
| | | | | |
* | | | | | Merge pull request #9687 from stouset/patch-1Rafael Mendonça França2013-03-121-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Also quote extension name in disable_extension
| * | | | | Also quote extension name in disable_extensionStephen Touset2013-03-121-1/+1
|/ / / / / | | | | | | | | | | A patch was committed recently which quoted the extension name in the SQL for `enable_extension`. But the same wasn't done for `disable_extension`.
* | | | | Stop calling "super" twice in Rails::Server#appCarlos Antonio da Silva2013-03-121-1/+4
| | | | | | | | | | | | | | | | | | | | Cache the value of "super" in a variable and use it instead.
* | | | | Remove manual "return true" from AS::TZ match methodCarlos Antonio da Silva2013-03-121-1/+1
| | | | |
* | | | | Merge pull request #9676 from neerajdotname/9567-destroy-should-call-destroy-allRafael Mendonça França2013-03-121-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | dependent: :destroy should call destroy_all
| * | | | dependent: :destroy should call destroy_allNeeraj Singh2013-03-111-2/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit https://github.com/rails/rails/pull/9668 shows warning when `delete_all` is invoked with `:dependent` option `:destroy`. Unfortunately invoking `Post.destroy_all` invokes `post.comments.delete_all` as part of `has_many` callbacks. This commit ensures that instead `post.comments.destroy_all` is invoked and in the process no warning is generated. See issue #9567 for details .
* | | | Merge pull request #9615 from mmb/copy_table_binary_sqliteCarlos Antonio da Silva2013-03-123-2/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Pass column to quote when copying a sqlite table. To make quote escape binary data correctly it needs the column passed in.
| * | | | Pass column to quote when copying a sqlite table.Matthew M. Boedicker2013-03-113-2/+23
| | |/ / | |/| | | | | | | | | | To make quote escape binary data correctly it needs the column passed in.
* | | | Merge pull request #9681 from vipulnsward/fix_typo_in_module_nameCarlos Antonio da Silva2013-03-124-7/+7
|\ \ \ \ | |/ / / |/| | | Fix typo in DependenciesTestHelpers module name
| * | | Fix typo in DependenciesTestHelpers module nameVipul A M2013-03-124-7/+7
| | | |
* | | | Fix typo [ci skip]Carlos Antonio da Silva2013-03-111-1/+1
| |/ / |/| |
* | | promotes change_column_null to the migrations APIXavier Noria2013-03-112-0/+27
| | |
* | | quick pass over the RDoc of schema_statements.rb [ci skip]Xavier Noria2013-03-111-122/+190
| | |
* | | documents how to DROP DEFAULT [ci skip]Xavier Noria2013-03-111-3/+7
| | |
* | | Merge pull request #9668 from neerajdotname/9567-delete-all-warningXavier Noria2013-03-111-0/+9
|\ \ \ | | | | | | | | Show warning message if delete_all is firing callbacks
| * | | Show warning message if delete_all is firing callbacksNeeraj Singh2013-03-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | `post.comments.delete_all` will fire callbacks if :dependent option is :destroy . It will be fixed in Rails 4.1 . In the meantime display a warning . Look at #9567 for details .
* | | | Replace assert_(no_)match args from regexps to strings to remove warningsCarlos Antonio da Silva2013-03-111-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | Using regexps as arguments without parentheses end up raising: warning: ambiguous first argument; put parentheses or even spaces
* | | | Skip fetching path if the iteration is going to be skippedCarlos Antonio da Silva2013-03-111-2/+2
| | | |
* | | | There's no need to install test group in travisSantiago Pastorino2013-03-112-2/+2
| | | |
* | | | Move benchmark-ips to test groupSantiago Pastorino2013-03-111-2/+2
| | | |
* | | | Use platforms instead of conditionals in GemfileSantiago Pastorino2013-03-111-4/+7
| | | |
* | | | Merge pull request #9666 from sikachu/master-fix-test_test_failureRafael Mendonça França2013-03-111-1/+17
|\ \ \ \ | | | | | | | | | | Make sure that the test case is run under test env
| * | | | Make sure that the test case is run under test envPrem Sichanugrist2013-03-111-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Unset $RAILS_ENV that got set by abstract_unit to trigger the default. * split out environment setting since Ruby 1.9.3 doesn't support inline ENV setting.
* | | | | Mention that debugging can be slow.Steve Klabnik2013-03-111-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/3180\#issuecomment-14705821 has mention of rendering going from 1-2ms to 4 seconds with this on, which seems reasonable: debugging is slow.
* | | | default the reaping frequency to 10 secondsAaron Patterson2013-03-111-1/+1
| | | |