aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17001 from ↵Yves Senn2014-09-222-35/+19
|\ | | | | | | | | claudiob/remove-wrapping-div-from-form-helpers-doc Remove wrapping <div> in form helpers from doc [ci skip]
| * Remove wrapping <div> in form helpers from docclaudiob2014-09-222-35/+19
|/ | | | | | | | | | [ci skip] 89ff1f8 and 1de258e6 removed from the HTML generated by the form helpers the <div> that was wrapping the field elements inside the <form>. This commit updates the documentation of the methods to reflect the two commits above.
* Merge pull request #17000 from yuki24/fix-false-assertionsYves Senn2014-09-222-3/+3
|\ | | | | Fix another false assertions
| * Fix another false assertionsYuki Nishijima2014-09-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | * The assertions in AS::Duration don't actually assert. * The assertion in Railtie will pass even when `eager_load_namespaces` doesn't include `AppTemplate::Application` if `Rails.application` is truthy. For more details, see here: * https://github.com/rails/rails/pull/16998 * https://github.com/rails/rails/pull/17000
* | Wrap it up! :trollface: [ci skip]Zachary Scott2014-09-221-3/+2
| |
* | Wrap Adequate Record release notes at 80 chars [ci skip]Zachary Scott2014-09-221-6/+14
|/
* Merge pull request #16998 from yuki24/fix-false-assertionMatthew Draper2014-09-221-3/+3
|\ | | | | Fix false assertions in AR::TestCase::AttributeMethodsTest
| * Fix assertions in AR::TestCase::AttributeMethodsTestYuki Nishijima2014-09-211-3/+3
| | | | | | | | | | This test has always been green because it uses "assert" and the first argument is an truthy class/object.
* | Merge pull request #16984 from chancancode/fix_16578Godfrey Chan2014-09-222-5/+16
|\ \ | | | | | | Document that the default for `rails server -b` has changed
| * | Document that the default for `rails server -b` has changedGodfrey Chan2014-09-222-5/+16
| | | | | | | | | | | | Fixes #16578
* | | Merge pull request #16979 from square/standardize-call-styleYves Senn2014-09-214-4/+4
|\ \ \ | |_|/ |/| | | | | Standardize on `Rails.application` [ci skip]
| * | Standardize on `Rails.application` [ci skip]Tamir Duberstein2014-09-195-7/+7
| | | | | | | | | | | | This seems to be the style settled on in most of the templates.
* | | Merge pull request #16994 from yuki24/fix-typo-in-ar-attribute-method-testZachary Scott2014-09-211-1/+1
|\ \ \ | | | | | | | | [ci skip] Fix typo in activerecord/test/cases/attribute_methods_test.rb:737
| * | | Fix typo [ci skip]Yuki Nishijima2014-09-201-1/+1
|/ / /
* | | Merge pull request #16988 from y-yagi/chg_default_log_levelZachary Scott2014-09-212-2/+2
|\ \ \ | | | | | | | | [ci skip] modify the description of production log level default
| * | | [ci skip] modify the description of production log level defaultyuuji.yaginuma2014-09-212-2/+2
| | |/ | |/|
* | | Merge pull request #16987 from jonatack/patch-8Yves Senn2014-09-201-13/+15
|\ \ \ | |/ / |/| | | | | ActiveRecord CHANGELOG improvements [skip ci]
| * | ActiveRecord CHANGELOG improvements [skip ci]Jon Atack2014-09-201-13/+15
|/ /
* | No need to call to_sym hereGodfrey Chan2014-09-203-10/+10
| | | | | | | | | | The hash is now string-keyed, and [_]reflect_on_association calls `to_s` on the argument anyway.
* | Fix find_by with associations not working with adequate recordGodfrey Chan2014-09-202-0/+8
| | | | | | | | | | | | | | | | | | For now, we will just skip the cache when a non-column key is used in the hash. If the future, we can probably move some of the logic in PredicateBuilder.expand up the chain to make caching possible for association queries. Closes #16903 Fixes #16884
* | Quick fix to address the borken build caused by #15791Godfrey Chan2014-09-201-1/+1
| | | | | | | | | | | | This is pretty lame though, so feel free to send a PR with a better fix! ;) cc @zev @tenderlove
* | Merge pull request #15791 from zev/add_model_to_recordnotfound_messageAaron Patterson2014-09-192-18/+26
|\ \ | | | | | | Update RecordNotFound exception cases to include a message with the
| * | Update RecordNotFound exception cases to include a message with theZev Blut2014-06-182-18/+26
| | | | | | | | | | | | Model that the Record was not found in.
* | | Merge pull request #16981 from gsamokovarov/concern-docs-comment-rewordRafael Mendonça França2014-09-191-1/+1
|\ \ \ | |_|/ |/| | [ci skip] Reword a comment in concern's documentation
| * | [ci skip] Reword a comment in concern's documentationGenadi Samokovarov2014-09-191-1/+1
|/ / | | | | | | | | Nothing biggie. Skimmed through `ActiveSupport::Concern` docs these days and this one comment seemed a bit off.
* | Merge pull request #16973 from prathamesh-sonpatki/fixtures-featuresRafael Mendonça França2014-09-191-0/+3
|\ \ | | | | | | Updated comment about features of fixtures
| * | Updated comment about features of fixturesPrathamesh Sonpatki2014-09-191-0/+3
| | | | | | | | | | | | | | | | | | - Added a note about some features which are not dependent on auto-generated ID's. - [ci skip]
* | | Merge pull request #16975 from lethalbrains/masterAbdelkader Boudih2014-09-191-18/+18
|\ \ \ | | | | | | | | [ci skip] ActionRecord CHANGELOG docs fixes
| * | | [ci skip] ActionRecord CHANGELOG docs fixeslethalbrains2014-09-191-18/+18
| |/ /
* | | Merge pull request #16964 from Agis-/issue-16956Matthew Draper2014-09-193-1/+26
|\ \ \ | |/ / |/| | Make delegation work with the reserved words passed to `:to`
| * | Delegation works with reserved words passed to `:to`Agis-2014-09-193-1/+26
|/ / | | | | | | Fixes #16956.
* | Merge pull request #16936 from untidy-hair/plugin_test_db_migrate_pathRafael Mendonça França2014-09-183-3/+21
|\ \ | | | | | | | | | | | | | | | | | | Specify dummy app's db migrate path in plugin's test_helper.rb Conflicts: railties/CHANGELOG.md
| * | Specify dummy app's db migrate path in plugin's test_helper.rbYukio Mizuta2014-09-163-3/+21
| | |
* | | inject Rack::Lock if config.eager_load is falseXavier Noria2014-09-183-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If code is not eager loaded constants are loaded on demand. Constant autoloading is not thread-safe, so if eager loading is not enabled multi-threading should not be allowed. This showed up in certain Capybara scenarios: Most Capybara drivers other than Rack::Test need a web server. In particular, drivers for JavaScript support. Capybara launches WEBrick in its own thread for those but that per se is fine, because the spec thread and the server thread are coordinated. Problem comes if the page being served in the spec makes Ajax calls. Those may hit WEBrick in parallel, and since WEBrick is multi-threaded and allow_concurrency? returns true in the test environment before this patch, threads are spawned to serve those parallel requests. On the other hand, since eager_load is false by default in the test environment, constants are not preloaded. So the suite is autoloading constants in a multi-threaded set. That's a receipt for paracetamol. The symptom is random obscure errors whose messages point somehow to constant autoloading. As a consequence of this fix for allow_concurrency? WEBrick in Capybara scenarios no longer runs in multi-threaded mode. Fixes #15089.
* | | Merge pull request #16954 from geoffharcourt/inject-over-sumRafael Mendonça França2014-09-181-2/+2
|\ \ \ | | | | | | | | Use #inject over #sum to build PG create DB statement
| * | | Use #inject over #sum to build PG create DB statementGeoff Harcourt2014-09-171-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While investigating #16951 I found that another library's monkey-patching of `Enumerable` was causing the test migrations helper to break when trying to build the `CREATE DATABASE` statement. The prior approach used `#sum` to build the string from the options hash. As the code that combines the options to build the database statement is not user-facing, using `#inject` here instead will remove the only place where the database creation/migration code is dependent on ActiveSupport's monkey-patching of `Enumerable`.
* | | Merge pull request #16953 from akshay-vishnoi/docs-rails-4point2Abdelkader Boudih2014-09-172-8/+8
|\ \ \ | | | | | | | | [ci skip] ActionView and ActionMailerCHANGELOG docs fixes
| * | | [ci skip] ActionView and ActionMailer CHANGELOG docs fixesAkshay Vishnoi2014-09-182-8/+8
| | | |
* | | | Merge pull request #16952 from akshay-vishnoi/docs-rails-4point2Rafael Mendonça França2014-09-171-8/+11
|\| | | | | | | | | | | [ci skip] ActiveModel CHANGELOG docs fixes
| * | | [ci skip] ActiveModel CHANGELOG docs fixesAkshay Vishnoi2014-09-181-8/+11
| | | |
* | | | Merge pull request #16950 from akshay-vishnoi/docs-rails-4point2Abdelkader Boudih2014-09-171-4/+4
|\| | | | | | | | | | | Grammar correction in ActiveSupport CHANGELOG [ci skip]
| * | | Grammar correction in ActiveSupport CHANGELOG [ci skip]Akshay Vishnoi2014-09-181-4/+4
| | | |
* | | | Merge pull request #16948 from akshay-vishnoi/docs-rails-4point2Rafael Mendonça França2014-09-172-20/+21
|\| | | | | | | | | | | [ci skip] ActiveSupport CHANGELOG fixes
| * | | [ci skip] ActiveSupport CHANGELOG fixesAkshay Vishnoi2014-09-182-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. spacing issues 2. spelling correction 3. grammar correction 4. Add missing docs
* | | | Merge pull request #16930 from todd/upgrade_guideAbdelkader Boudih2014-09-171-4/+40
|\ \ \ \ | | | | | | | | | | Added Responders docs, made Web Console docs more consistent. [ci skip]
| * | | | Added Responders docs, made Web Console docs more consistent. [ci skip]Todd Bealmear2014-09-161-4/+40
| | | | |
* | | | | Merge pull request #16944 from akshay-vishnoi/docs-rails-4point2Rafael Mendonça França2014-09-1714-22/+22
|\ \ \ \ \ | | |/ / / | |/| | | [ci skip] AJ docs fixes
| * | | | [ci skip] AJ docs fixesAkshay Vishnoi2014-09-1814-22/+22
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 1. Indentation 2. Spaces issues 3. Spelling correction 4. Grammar correction 5. Add #:nodoc: to all internal classes
* | | | Use has_attribute?Rafael Mendonça França2014-09-171-1/+1
| | | |
* | | | Merge pull request #16875 from alan/dont_autosave_has_one_through_recordRafael Mendonça França2014-09-173-1/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't autosave unchanged has_one through records Conflicts: activerecord/CHANGELOG.md
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 06:55:46 +0000