aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Use new hash syntaxMikhail Dieterle2013-05-141-2/+2
| | | |
| * | | improved doc for ActiveRecord#find_by_sql method (Refs #10599) [ci skip]Anton Kalyaev2013-05-141-3/+4
| | | |
| * | | Added documentation for model migration generationaditya-kapoor2013-05-141-0/+4
| | | |
| * | | Added documentation for Rails::Generators::NamedBase.templateaditya-kapoor2013-05-141-0/+4
| | | |
| * | | fix grammarAdam Konner2013-05-131-2/+2
| | | |
| * | | emphasize that callbacks are called in destroy_allNeeraj Singh2013-05-132-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up rdoc a bit emphasizing that callbacks are called. Also removed the stress on the fact that records are always removed. If callbacks return false then records will not be deleted.
| * | | Document ActionMailer::Base#set_content_typeZachary Scott2013-05-121-0/+9
| | | |
* | | | Merge pull request #10678 from prathamesh-sonpatki/typosCarlos Antonio da Silva2013-05-183-3/+3
|\ \ \ \ | | | | | | | | | | Fixed some typos
| * | | | Fxied some typosPrathamesh Sonpatki2013-05-183-3/+3
| | | | |
* | | | | Merge pull request #10597 from steveklabnik/patch_documentationSteve Klabnik2013-05-181-0/+53
|\ \ \ \ \ | |/ / / / |/| | | | Adding notes on PATCH to the upgrade guide. [ci skip]
| * | | | Adding notes on PATCH to the upgrade guide.Steve Klabnik2013-05-131-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discusses compatibility between PATCH and PUT, as well as how to add support for JSON PATCH to your application. Fixes #10439.
* | | | | Merge pull request #10676 from tkhr/add-test-to-counter_cache_test.rbRafael Mendonça França2013-05-185-4/+18
|\ \ \ \ \ | | | | | | | | | | | | Add test to counter cache test.rb
| * | | | | Fix tests which started to fail due to commit ↵Takehiro Adachi2013-05-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0123c39f41e2062311b2197e6e230ef8ad67e20e Due to commit 0123c39f41e2062311b2197e6e230ef8ad67e20e, column topic.unique_replies_count has been added, and these test started to fail since the tests depends on the topic tables column info.
| * | | | | Add test to AR's counter_cache_test.rbTakehiro Adachi2013-05-183-0/+14
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://github.com/rails/rails/blob/b601399b72ab56cc01368f02615af99f45d1 4f02/activerecord/lib/active_record/counter_cache.rb#L14, u can pass more then one association to the `reset_counters` method.
* | | | | Merge pull request #10675 from prathamesh-sonpatki/dont-auto-require-mochaRafael Mendonça França2013-05-181-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Don't autorequire mocha to avoid deprecation warnings
| * | | | | Don't autorequire mocha to avoid deprecation warningsPrathamesh Sonpatki2013-05-181-1/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://travis-ci.org/rails/rails/jobs/7264822 contains deprecated warnings given by Mocha version 0.14 - 632f215da added Mocha 0.14 to Gemfile - But with the version, require: false was removed - So Mocha started giving deprecation warnings - Acc.to Mocha documentation(https://github.com/freerange/mocha#bundler) it should not be auto required.
* | | | | stop swallowing exceptions in assert_queries. Methods that raise anAaron Patterson2013-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | exception are unlikely to pass this assertion, but since the assertions raise an exception, the original exception is lost.
* | | | | Merge pull request #10672 from carllerche/masterSantiago Pastorino2013-05-172-0/+29
|\ \ \ \ \ | | | | | | | | | | | | Bug fix: Evented notification subscribers can handle published events
| * | | | | Bug fix: Evented notification subscribers can handle published eventsCarl Lerche2013-05-172-0/+29
|/ / / / /
* | | | | stop doing assingments in an iteratorAaron Patterson2013-05-171-2/+6
| | | | |
* | | | | include bind values from the default scopeAaron Patterson2013-05-172-6/+5
|/ / / /
* | | | Merge pull request #10657 from AJ-Acevedo/pluginRafael Mendonça França2013-05-161-0/+1
|\ \ \ \ | |_|_|/ |/| | | plugin new missing license spec
| * | | plugin new missing license specAJ Acevedo2013-05-161-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | When bundling a gem created with rails plugin new Bundler outputs the following warning when building the gem: WARNING: licenses is empty modified: railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
* | | let Ruby do the is_a check for usAaron Patterson2013-05-161-3/+4
| | |
* | | Merge pull request #10656 from zenspider/fix_mocha_backAaron Patterson2013-05-161-1/+1
|\ \ \ | | | | | | | | Mocha 0.14.0 was released with MT5 support. Switch back to gem
| * | | Mocha 0.14.0 was released with MT5 support. Switch back to gemRyan Davis2013-05-161-1/+1
|/ / /
* | | Fix named routing regression from 3.2.13schneems2013-05-162-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When named route that is nested is used in 3.2.13 Example `routes.rb`: ``` resources :nested do resources :builder, :controller => 'nested/builder' end ``` In 3.2.12 and 3.2.12 this named route would work: ``` nested_builder_path(:last_step, :nested_id => "foo") ``` Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys. Not sure if this is exactly how the original version worked, but this fixes this use case regression.
* | | Revert "just call the class method since we know the callbacks are stored at ↵Aaron Patterson2013-05-161-2/+1
| | | | | | | | | | | | | | | | | | the" This reverts commit 55975c71ec9c2c18b67020484959ff5c69d4d3fb.
* | | Merge pull request #10652 from md5/concern-multiple-includedRafael Mendonça França2013-05-163-0/+28
|\ \ \ | | | | | | | | Raise an error when multiple included blocks are defined for a Concern
| * | | Raise when multiple included blocks are definedMike Dillon2013-05-163-0/+28
| | | |
* | | | Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-1613-146/+50
|\ \ \ \ | | | | | | | | | | Squishy minitest5
| * | | | oops. I should have only required minitest, not minitets/autorun. muscle memory.Ryan Davis2013-05-091-1/+1
| | | | |
| * | | | tweak dependenciesRyan Davis2013-05-082-2/+2
| | | | |
| * | | | Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-0611-144/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Namespace changes, overhaul of runners. + Internal ivar name changes - Removed a logger globally applied to tests that spew everywhere?!? + Override Minitest#__run to sort tests by name. + Reworked testing isolation to work with the new cleaner architecture. - Removed a bunch of tests that just test minitest straight up. I think these changes were all merged to minitest 4 a long time ago. - Minor report output differences.
* | | | | test refactorAaron Patterson2013-05-161-5/+2
| | | | |
* | | | | Add more data to AR::UnknownAttributeErrorBogdan Gusiev2013-05-163-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | begin Topic.new("hello" => "world") rescue ActiveRecord::UnknownAttributeError => e e.record # => #<Topic ... > e.attribute # => "hello" end
* | | | | Merge pull request #10594 from shime/rack-debuggerAaron Patterson2013-05-162-4/+4
|\ \ \ \ \ | | | | | | | | | | | | exit with non-zero to signal failure
| * | | | | exit with non-zero to signal failureHrvoje Šimić2013-05-132-4/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #10619 from alno/top_level_array_in_postgres_jsonAaron Patterson2013-05-163-1/+17
|\ \ \ \ \ | | | | | | | | | | | | Support array as root element in Postgresql JSON columns
| * | | | | Support array as root element in JSONAlexey Noskov2013-05-143-1/+17
| | | | | |
* | | | | | Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-162-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba. Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/testing/integration.rb actionpack/test/controller/integration_test.rb Reason: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* | | | | | Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nilRafael Mendonça França2013-05-162-1/+13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | fix rails4 regression with asset_host Proc returning nil
| * | | | | restore ability to return nil from asset_host proc, add testSean Walbran2013-05-152-1/+13
| | | | | |
* | | | | | restore whitespace in Gemfile between sqlite3 and sprocketsSam Ruby2013-05-161-1/+1
| | | | | |
* | | | | | Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-162-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0303c2325fab253adf5e4a0b738cb469c048f008. Conflicts: actionpack/lib/action_controller/test_case.rb REASON: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* | | | | | Check if APP_RAKEFILE is definedPiotr Sarnacki2013-05-161-1/+1
| | | | | |
* | | | | | Merge pull request #10639 from cbartlett/masterCarlos Antonio da Silva2013-05-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove trailing line break in template
| * | | | | | Remove trailing line breakColin Bartlett2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you generate a fresh app without ActiverRecord, this template exhibited a lone trailing line break. My watchful pre-commit hook told me about it so I've fixed it here.
* | | | | | | Merge pull request #10640 from joelcogen/masterPiotr Sarnacki2013-05-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix detection of engine in rake db:load_config
| * | | | | | Fix detection of engine in rake db:load_configJoel Cogen2013-05-161-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Broken by d1d7c86d0c8dcb7e75a87644b330c4e9e7d6c1c1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 06:28:58 +0000