aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Don't autosave unchanged has_one through recordsAlan Kennedy2014-09-153-1/+31
| | | |
* | | | Merge pull request #16943 from sgrif/sg-fix-tz-converter-serializationRafael Mendonça França2014-09-175-3/+28
|\ \ \ \ | | | | | | | | | | Allow YAML serialization when using TZ aware attributes
| * | | | Allow YAML serialization when using TZ aware attributesSean Griffin2014-09-175-3/+28
| | | | |
* | | | | Merge pull request #11794 from yoazt/duration-eqlRafael Mendonça França2014-09-173-1/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added method `#eql?` to `ActiveSupport::Duration`, in addition to `#==`. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/duration.rb activesupport/test/core_ext/duration_test.rb
| * | | | | Added method `#eql?` to `ActiveSupport::Duration`, in addition to `#==`.Joost Lubach2013-08-073-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the following returns `false`, contrary to expectation: 1.minute.eql?(1.minute) Adding method `#eql?` will make this behave like expected. Method `#eql?` is just a bit stricter than `#==`, as it checks whether the argument is also a uration. Their parts may be different though. 1.minute.eql?(60.seconds) # => true 1.minute.eql?(60) # => false
* | | | | | Merge pull request #16929 from ↵Rafael Mendonça França2014-09-171-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | kongregate/fix-activerecord-deprecated_finders-find-symbol ActiveRecord deprecated finders are broken in 4.2
| * | | | | Backwards compat for activerecord-deprecated_findersstopdropandrew2014-09-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain compatibility for: * ActiveRecord::Base#find(:all) * ActiveRecord::Base#find(:first) * ActiveRecord::Base#find(:last)
* | | | | | OMG mysql!Rafael Mendonça França2014-09-171-0/+2
| | | | | |
* | | | | | ruby-head should be greenRafael Mendonça França2014-09-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.2 is near to be released so we should support it properly
* | | | | | do not dump foreign keys for ignored tables.Yves Senn2014-09-173-1/+8
| | | | | |
* | | | | | unify wording in Active Record CHANGELOG. [ci skip]Yves Senn2014-09-171-1/+1
| | | | | |
* | | | | | pg, correctly dump foreign keys targeting tables in a different schema.Yves Senn2014-09-173-1/+35
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Closes #16907. [Matthew Draper & Yves Senn]
* | | | | Merge pull request #16844 from zerothabhishek/masterRafael Mendonça França2014-09-161-4/+33
|\ \ \ \ \ | | | | | | | | | | | | [guides] 4.2 release notes: added technical details for Adequate Record
| * | | | | [guides] 4.2 release notes: added technical details for Adequate Recordabhishek2014-09-161-4/+33
| |/ / / /
* | | | | Merge pull request #16841 from tjouan/environment-config-consistencyRafael Mendonça França2014-09-161-3/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Improve environment config templates consistency
| * | | | Improve environment config templates consistency:Thibault Jouan2014-09-161-3/+4
|/ / / / | | | | | | | | | | | | | | | | * Fix long lines; * Use simple quotes for string literals when interpolation is not used.
* | | | Merge pull request #16790 from cirosantilli/explain-erb-space-removalRafael Mendonça França2014-09-161-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Explain ERB space removal. [ci skip]
| * | | | Explain ERB space removal. [ci skip]Ciro Santilli2014-09-111-1/+3
| | | | |
* | | | | Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_errorRafael Mendonça França2014-09-163-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Use dynamic path for dummy app location in plugin's test_helper.rb
| * | | | | Use dynamic path for dummy app location in plugin's test_helper.rbYukio Mizuta2014-09-143-2/+10
| | | | | |
* | | | | | Make explicit 4.1 is being maintained by a special situationRafael Mendonça França2014-09-161-1/+4
| |_|_|_|/ |/| | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #16927 from akshay-vishnoi/fix-typoRafael Mendonça França2014-09-151-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | [ci skip] Fix typo `equals to` --> `equal to`
| * | | | [ci skip] Fix typo `equals to` --> `equal to`Akshay Vishnoi2014-09-161-1/+1
|/ / / /
* | | | As of Unicode 6.3, Mongolian Vowel Separator is not whitespaceMatthew Draper2014-09-154-6/+5
| | | | | | | | | | | | | | | | | | | | Ruby 2.2 knows this, and no longer matches it with [[:space:]], so it's not a good candidate for testing String#squish.
* | | | Merge pull request #16574 from lsylvester/duration-respond_toJeremy Kemper2014-09-143-2/+19
|\ \ \ \ | | | | | | | | | | add implementation of respond_to? for ActiveSupport::Duration
| * | | | add implementation of respond_to? for ActiveSupport::Durationlsylvester2014-09-153-2/+19
|/ / / /
* | | | Merge pull request #16922 from y-yagi/add_test_jobs_taskGodfrey Chan2014-09-152-6/+17
|\ \ \ \ | | | | | | | | | | Add test jobs task
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 03:56:21 +0000