aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665.Yves Senn2014-01-133-2/+26
| | | | | | | | This prevents Rails from assigning meaningless log levels to third party loggers like log4r. If `Rails.logger` is not `kind_of?(::Logger)` we simply assign the `config.log_level` as is. This bug was introduced by #11665.
* Merge pull request #13699 from rystraum/dependent-restrict-removalRafael Mendonça França2014-01-131-0/+4
|\ | | | | Updated Changelog to reflect removal of :dependent => :restrict
| * Updated Changelog to reflect removal of :dependent => :restrictRystraum Gamonez2014-01-141-0/+4
|/ | | | | Based on https://github.com/rails/rails/issues/2502, the option has been removed.
* Merge pull request #13693 from gaurish/typoYves Senn2014-01-137-6/+39
|\ | | | | [JRuby] Fix incorrect RUBY_ENGINE value
| * standardize on jruby_skip & rbx_skipGaurish Sharma2014-01-137-6/+39
| | | | | | | | | | | | This Adds helpers(jruby_skip & rbx_skip). In Future, Plan is to use these helpers instead of calls directly to RUBY_ENGINE/RbConfig/JRUBY_VERSION
* | fix bug in becomes! when changing from base to subclass. Closes #13272.Yves Senn2014-01-133-1/+22
|/
* highlight http://localhost:3000 in README.md. Closes #13643. [ci skip]Yves Senn2014-01-131-1/+2
| | | | | This has no effect on the API docs. The main API page is taken from: railties/RDOC_MAIN.rdoc
* doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip]Yves Senn2014-01-131-1/+2
|
* Merge pull request #13687 from gaurish/spring-has-no-love-for-jrubyYves Senn2014-01-121-0/+2
|\ | | | | Skip Spring App Generator tests on JRuby
| * Skip Spring App Generator tests on JRubyGaurish Sharma2014-01-131-0/+2
| | | | | | | | | | Spring makes extensive use of Process.fork, so won't be able to provide JRuby Support, hence skip these tests on JRuby.
* | Merge pull request #13646 from jenseng/json_escapeGodfrey Chan2014-01-121-12/+12
|\ \ | | | | | | Clarify behavior of json_escape [ci skip]
| * | Clarify behavior of json_escape, update examplesJon Jensen2014-01-091-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | The behavior of json_escape was fixed in 2f1c5789, but the doc changes and example in that commit incorrectly indicated that the return value would be html-safe. Since quotation marks are preserved, the raw value is not safe to use in other contexts (specifically HTML attributes).
* | | Merge pull request #13673 from senny/use_enum_label_in_formsDavid Heinemeier Hansson2014-01-122-0/+7
|\ \ \ | |_|/ |/| | use enum labels as form values. Achieved by `_before_type_cast`.
| * | use enum labels as form values. Achieved by `_before_type_cast`.Yves Senn2014-01-112-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13650, #13672 This is an alternate implementation to solve #13650. Currently form fields contain the enum value (eg. "1"). This breaks because the setter `enum=` expects the label (eg. "active"). ActiveRecord::Enum allows you to use labels in your application but store numbers. We should make sure that all parts after AR are dealing with labels and not the underlying mapping to a number. This patch defines `_before_type_cast` on every enum column to return the label. This method is later used to fetch the value to display in form fields. I deliberately copied the implementation of the enum getter instead of delegating to it. This allows you to overwrite the getter and for example return a `Value Object` but have it still work for form fields.
* | | fixes a typo in a CHANGELOGXavier Noria2014-01-121-1/+1
| | |
* | | upgrade SDocXavier Noria2014-01-126-12/+14
| | | | | | | | | | | | Kudos to @zzak for taking over SDoc and make it work with RDoc 4.
* | | fixes the Gemfile generator templatesXavier Noria2014-01-122-8/+4
| | | | | | | | | | | | | | | | | | The templates were written as if for a given gem you could either pass a version or options, but not both. But you may want to specify a version and also a group or whether the gem has to be required, for example.
* | | Merge pull request #13668 from prathamesh-sonpatki/issue-13667Andrew White2014-01-122-2/+5
|\ \ \ | | | | | | | | Fix iterating over DateTime by doing strict checking for Time objects
| * | | Fix iterating over DateTime by doing strict checking for Time objectsPrathamesh Sonpatki2014-01-112-2/+5
| | | | | | | | | | | | | | | | - Fixes #13667
* | | | Merge pull request #13671 from arunagw/upgrade-bundlerAndrew White2014-01-111-13/+3
|\ \ \ \ | |_|/ / |/| | | Removing without_thor_debug
| * | | Removing without_thor_debugArun Agrawal2014-01-111-13/+3
|/ / / | | | | | | | | | | | | a1d0c0fa3d8ca97edc8f2a1d6ba96af19221dbad as bundler 1.5.2 is out now
* | | Merge branch 'master' into laurocaetano-fix_send_fileAaron Patterson2014-01-10494-3334/+9555
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (536 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: actionpack/CHANGELOG.md
| * \ \ Merge branch 'ruby-2.2'Aaron Patterson2014-01-102-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ruby-2.2: Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
| | * \ \ Merge branch 'master' into ruby-2.2Aaron Patterson2014-01-092-17/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * master: Revert "ask the fixture set for the sql statements"
| | * | | | Check `respond_to` before delegation due to: ↵Aaron Patterson2014-01-092-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
| * | | | | doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]Yves Senn2014-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Refs #13658
| * | | | | Merge pull request #13657 from leriksen/masterYves Senn2014-01-091-2/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets re...
| | * | | | | [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce ↵leriksen2014-01-101-2/+0
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | any confusion for users
| * | | | | Merge pull request #13659 from prathamesh-sonpatki/fix-buildGuillermo Iguaran2014-01-091-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | Restore DATABASE_URL even if it's nil in connection_handler test
| | * | | Restore DATABASE_URL even if it's nil in connection_handler testPrathamesh Sonpatki2014-01-101-1/+1
| |/ / / | | | | | | | | | | | | | | | | - We have to restore DATABASE_URL to its previous state irrespective of previous value is nil or not
| * | | Merge pull request #13582 from schneems/schneems/preserve-connection-behaviorRafael Mendonça França2014-01-0911-33/+409
| |\ \ \ | | |_|/ | |/| | Ensure Active Record connection consistency
| | * | Ensure Active Record connection consistencyschneems2014-01-0911-33/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Active Record can be configured via the environment variable `DATABASE_URL` or by manually injecting a hash of values which is what Rails does, reading in `database.yml` and setting Active Record appropriately. Active Record expects to be able to use `DATABASE_URL` without the use of Rails, and we cannot rip out this functionality without deprecating. This presents a problem though when both config is set, and a `DATABASE_URL` is present. Currently the `DATABASE_URL` should "win" and none of the values in `database.yml` are used. This is somewhat unexpected to me if I were to set values such as `pool` in the `production:` group of `database.yml` they are ignored. There are many ways that active record initiates a connection today: - Stand Alone (without rails) - `rake db:<tasks>` - ActiveRecord.establish_connection - With Rails - `rake db:<tasks>` - `rails <server> | <console>` - `rails dbconsole` We should make all of these behave exactly the same way. The best way to do this is to put all of this logic in one place so it is guaranteed to be used. Here is my prosed matrix of how this behavior should work: ``` No database.yml No DATABASE_URL => Error ``` ``` database.yml present No DATABASE_URL => Use database.yml configuration ``` ``` No database.yml DATABASE_URL present => use DATABASE_URL configuration ``` ``` database.yml present DATABASE_URL present => Merged into `url` sub key. If both specify `url` sub key, the `database.yml` `url` sub key "wins". If other paramaters `adapter` or `database` are specified in YAML, they are discarded as the `url` sub key "wins". ``` ### Implementation Current implementation uses `ActiveRecord::Base.configurations` to resolve and merge all connection information before returning. This is achieved through a utility class: `ActiveRecord::ConnectionHandling::MergeAndResolveDefaultUrlConfig`. To understand the exact behavior of this class, it is best to review the behavior in activerecord/test/cases/connection_adapters/connection_handler_test.rb though it should match the above proposal.
| * | | Revert "ask the fixture set for the sql statements"Aaron Patterson2014-01-092-17/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This reverts commit 026d0555685087845b74dd87a0417b5a164b1c13. Conflicts: activerecord/lib/active_record/fixtures.rb Fixes #13383
| * | Merge pull request #13632 from tinogomes/masterRafael Mendonça França2014-01-095-0/+63
| |\ \ | | |/ | |/| Adding Hash#compact and Hash#compact! methods
| | * Adding Hash#compact and Hash#compact! methodstinogomes2014-01-095-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding Hash#compact and Hash#compact! methods * Using Ruby 1.9 syntax on documentation * Updating guides for `Hash#compact` and `Hash#compact!` methods * Updating CHANGELOG for ActiveSupport * Removing unecessary protected method and lambda for `Hash#compact` implementations * Performing `Hash#compact` implementation - https://gist.github.com/tinogomes/8332883 * fixing order position * Fixing typo
| * | Merge pull request #13644 from zzak/doc_mysql_config_templateGuillermo Iguaran2014-01-081-1/+1
| |\ \ | | | | | | | | MySQL version 4.1 was EOL on December 31, 2009 [ci-skip]
| | * | MySQL version 4.1 was EOL on December 31, 2009Zachary Scott2014-01-081-1/+1
| |/ / | | | | | | | | | We should at least recommend modern versions of MySQL to users.
| * | clear cache on body close so that cache remains during renderingAaron Patterson2014-01-082-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | fixes #13547 The body may use the local cache during rendering. `call`ing the app doesn't mean that rendering is finished, so we need to wait until `close` is called on the body.
| * | add a more restricted codepath for templates fixes #13390Aaron Patterson2014-01-082-12/+51
| | |
| * | Merge pull request #13637 from craftsmen/app-generator-minor-fixRafael Mendonça França2014-01-081-4/+4
| |\ \ | | | | | | | | Move finish_template as the last public method defined in the generator
| | * | Move finish_template as the last public method in the generatorMehdi Lahmam2014-01-081-4/+4
| | |/
| * | refactor generator tests to use block form of TempfileAaron Patterson2014-01-081-36/+30
| | |
| * | Merge pull request #13634 from jwworth/masterCarlos Antonio da Silva2014-01-081-1/+1
| |\ \ | | |/ | |/| Fix typo [ci skip]
| | * Fix typo [ci skip]Jake Worth2014-01-081-1/+1
| |/
| * Minor typos fix [ci skip]Robin Dupret2014-01-081-3/+3
| |
| * make `change_column_null` reversible. Closes #13576.Yves Senn2014-01-083-1/+26
| | | | | | | | Closes #13623.
| * Merge pull request #13629 from dmathieu/drop_testYves Senn2014-01-085-5/+40
| |\ | | | | | | Be more explicit about the default of db:drop and db:create
| | * create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-085-5/+40
| |/ | | | | | | Closes #13625
| * Revert "Speedup String#to"Yves Senn2014-01-082-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ef1fb2c455ca53a0c1e1768f50824926ce28bd3. As described in PR #13627 this commit broke functionality when passing a negative Fixnum to the `String#to` method: ```ruby assert_equal "hell", s.to(-2) ``` Before the revert, this failed with: ``` 1) Failure: StringAccessTest#test_#to_with_negative_Fixnum,_position_is_counted_from_the_end [test/core_ext/string_ext_test.rb:275]: Expected: "hell" Actual: nil ``` This revert is to keep the functionality on `master` working. If there is another way to get the performance benefit and keep the documented functionality we can add that. /cc @amatsuda @carlosantoniodasilva
| * typo fix in test name. [ci skip].Yves Senn2014-01-081-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 06:44:52 +0000