aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8959 from vitorbaptista/masterRafael Mendonça França2013-01-163-3/+6
|\ | | | | Don't rely on Hash key's ordering to configure default options
| * Don't rely on Hash key's orderingVitor Baptista2013-01-163-3/+6
|/ | | | | | | | | | | | | | | | | | | If we set encoding latin1 for a PostgreSQL database, it calls PostgreSQLAdapter::create_database with options that have, among other things: { 'encoding' => 'latin1' } Then, we use reverse_merge(:encoding => "utf8") to setup the default encoding. In the end, the hash looks like: { :encoding => 'utf8', 'encoding' => 'latin1' } The call to options.symbolize_keys calls to_sym on each_key of this Hash. It usually means that the encoding passed overwrites the default utf8, but it's not guaranteed. So, we shouldn't rely on it. The same was happening in ActiveRecord::ConnectionHandling.
* Remove warnings: "(...) interpreted as grouped expression"Carlos Antonio da Silva2013-01-161-2/+2
|
* Merge pull request #8963 from asanghi/regress_8631Andrew White2013-01-161-0/+21
|\ | | | | adding regression test in master for #8631
| * adding regression test in master for #8631Aditya Sanghi2013-01-161-0/+21
|/
* Merge pull request #8955 from burns/source_annotationRafael Mendonça França2013-01-153-16/+76
|\ | | | | Allow a `:dirs` option to `SourceAnnotationExtractor.enumerate`
| * allow :dirs option for .enumerateBrian D. Burns2013-01-153-6/+60
| | | | | | | | | | | | Allows custom rake tasks to be defined using: SourceAnnotationExtractor.enumerate 'TODO|FIXME', dirs: %w(app lib), tag: true
| * use case statementBrian D. Burns2013-01-151-10/+16
| |
* | Merge pull request #8958 from balexand/strong_parameters_exception_handlingRafael Mendonça França2013-01-154-16/+14
|\ \ | | | | | | Strong parameters exception handling
| * | strong parameters exception handlingBrian Alexander2013-01-154-16/+14
| | |
* | | Merge pull request #8914 from nilbus/fix-header-bloatRafael Mendonça França2013-01-153-2/+10
|\ \ \ | |/ / |/| | Remove header bloat introduced by BestStandardsSupport middleware
| * | Remove header bloat introduced by BestStandardsSupport middlewareEdward Anderson2013-01-153-2/+10
|/ / | | | | | | The same headers were being duplicated on every request.
* | Merge pull request #8954 from davetoxa/patch-1Carlos Antonio da Silva2013-01-151-1/+0
|\ \ | | | | | | Update guides/source/active_record_validations.md
| * | Update guides/source/active_record_validations.mdAnton Cherepanov2013-01-151-1/+0
| | | | | | | | | Duplicated `update`
* | | Merge pull request #8940 from adomokos/adding_tests_for_changed_attributesCarlos Antonio da Silva2013-01-151-1/+12
|\ \ \ | |_|/ |/| | Cleaning up ActiveModel::Dirty tests
| * | Cleaning up ActiveModel::Dirty testsAttila Domokos2013-01-151-1/+12
| | | | | | | | | | | | | | | | | | | | | * Clarifying what the #changed method returns * Adding tests to describe what the #changed_attributes returns * Updating test name based on pull request comment * Moving the test lower in the file per pull request comment
* | | Change the behavior of route defaultsAndrew White2013-01-157-11/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes route defaults so that explicit defaults are no longer required where the key is not part of the path. For example: resources :posts, bucket_type: 'posts' will be required whenever constructing the url from a hash such as a functional test or using url_for directly. However using the explicit form alters the behavior so it's not required: resources :projects, defaults: { bucket_type: 'projects' } This changes existing behavior slightly in that any routes which only differ in their defaults will match the first route rather than the closest match. Closes #8814
* | | Add support for other types of routing constraintsAndrew White2013-01-155-113/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now allows the use of arrays like this: get '/foo/:action', to: 'foo', constraints: { subdomain: %w[www admin] } or constraints where the request method returns an Fixnum like this: get '/foo', to: 'foo#index', constraints: { port: 8080 } Note that this only applies to constraints on the request - path constraints still need to be specified as Regexps as the various constraints are compiled into a single Regexp.
* | | Ensure port is set when passed via the process methodAndrew White2013-01-153-1/+58
| | |
* | | Raise correct exception now Journey is integrated.Andrew White2013-01-153-9/+12
| | | | | | | | | | | | | | | | | | | | | Now that Journey has been integrated into ActionDispatch we can raise the exception ActionController::UrlGenerationError directly rather than raising the internal Journey::Router::RoutingError and then have ActionDispatch::Routing::RouteSet#generate re-raise the exception.
* | | Revert "Merge pull request #8930 from cordawyn/ordered_railties"Carlos Antonio da Silva2013-01-152-5/+1
| |/ |/| | | | | | | | | | | | | | | | | This reverts commit 8348f9ea72c9b50fc4d4462fd9ebe3bba932c783, reversing changes made to 9dfe2d6f9fabddf9a451a995678a9648c8aaf401. Reason: this broke railties tests as explained in the issue, and the author is going to review and report back. https://github.com/rails/rails/pull/8930#issuecomment-12272671
* | Merge pull request #8930 from cordawyn/ordered_railtiesCarlos Antonio da Silva2013-01-152-1/+5
|\ \ | | | | | | rake railties:install:migrations respects the order of railties
| * | rake railties:install:migrations respects the order of railtiesSlava Kravchenko2013-01-142-1/+5
| | |
* | | Revert "log at debug level what line caused the redirect_to"Carlos Antonio da Silva2013-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3fa00070047b5d019d39e691598ee2890283d052. Reason: This message is usually not accurate and annoying: Redirected by ~/.rbenv/versions/1.9.3-p327-perf/lib/ruby/1.9.1/logger.rb:371:in `add'`
* | | Improve mysql database tasks handling to ensure we always rescue from an ↵Carlos Antonio da Silva2013-01-151-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception We were previously rescuing "nil" when no exception class was found. This does work in 1.9.3, but does not in 2.0, raising an exception asking for a class or module to be given to the rescue clause. Thanks @yahonda for catching this.
* | | Revert "Merge pull request #8942 from yahonda/tested_only_with_mysql"Carlos Antonio da Silva2013-01-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1fc294f988e93ac59057a16b0e44b9cf93af9720, reversing changes made to fb9ac47c286fbdfe05263d4d0346e50892090603. Reason: these tests should run fine independent of database, since they should only take into account the configuration options. The problem was related to a change in the way "nil" is handled by the rescue clause, in Ruby 2.0 it raises an exception asking for class or module, in 1.9 it passes.
* | | Merge pull request #8949 from joneslee85/patch-2Xavier Noria2013-01-151-2/+2
|\ \ \ | | | | | | | | ActiveRecord <-> Active Record [ci skip]
| * | | ActiveRecord <-> Active Record [ci skip]Trung Lê2013-01-151-2/+2
|/ / /
* | | Merge pull request #8946 from reednj77/rack-cache-headersDavid Heinemeier Hansson2013-01-141-6/+6
|\ \ \ | | | | | | | | Account for ignored cookie set by turbolinks
| * | | Account for ignored cookie set by turbolinksNick Reed2013-01-141-6/+6
| | | |
* | | | Merge pull request #8947 from joneslee85/patch-1Guillermo Iguaran2013-01-141-1/+1
|\ \ \ \ | |/ / / |/| | | Use Rails 4 find_by in README [ci skip]
| * | | Use Rails 4 find_by in README [ci skip]Trung Lê2013-01-151-1/+1
|/ / /
* | | Merge pull request #8942 from yahonda/tested_only_with_mysqlRafael Mendonça França2013-01-141-0/+4
|\ \ \ | | | | | | | | Address test_create_when_database_exists_outputs_info_to_stderr failures
| * | | Address test_create_when_database_exists_outputs_info_to_stderr failuresYasuo Honda2013-01-151-0/+4
| |/ / | | | | | | | | | | | | When tested with ruby-2.0.0-rc1 `rake test` executes this test even if the target adapter is not mysql nor mysql2.
* | | Merge pull request #8939 from senny/to_partial_path_test_to_prevent_regressionsRafael Mendonça França2013-01-142-0/+8
|\ \ \ | | | | | | | | test case for ActiveModel::Conversion#to_partial_path and namespaced models
| * | | test for ActiveModel::Conversion#to_partial_path and namespaced modelsYves Senn2013-01-142-0/+8
| | |/ | |/|
* | | Merge pull request #8938 from colinbm/date_select_valueSteve Klabnik2013-01-144-4/+57
|\ \ \ | |/ / |/| | Rename :value to :selected for date_select, and add missing tests/docs
| * | Rename :value option to :selected, in line with other select helpersColin Burn-Murdoch2013-01-144-4/+57
| | | | | | | | | | | | | | | Add tests for time & datetime. Add documentation.
* | | Revert benchmark helper regression. Use a #capture within a #benchmarkJeremy Kemper2013-01-143-39/+3
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | block. Breaks benchmark calls that return non-String values otherwise. Revert "add benchmark helper that works in erb" This reverts commit 904e544cc8f5846de7c31827bb5556c6a238c0de. Conflicts: actionpack/lib/action_view/helpers.rb actionpack/lib/action_view/helpers/benchmark_helper.rb actionpack/test/template/benchmark_helper_test.rb
* | Test to allow Range including DateTime and DateTime::Infinitygsphanikumar2013-01-141-0/+6
| | | | | | | | Closes #8587
* | Merge pull request #8916 from josemota/collection-with-blockRafael Mendonça França2013-01-132-4/+53
|\ \ | | | | | | | | | | | | Collection radio buttons and collection check boxes through FormBuilder render the provided block. Closes #8897
| * | Collection radio buttons and collection check boxes through FormBuilder renderJosé Mota2013-01-122-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | the provided block. In the case of having a form_for method being called, the block for each collection would not be passed and thus the result expected was always the same. This patch passes the block to the original method like it would be assumed.
* | | Add regression test to #8907Rafael Mendonça França2013-01-141-0/+31
| | |
* | | Merge pull request #8917 from adomokos/adding_more_tests_to_activemodel_modelRafael Mendonça França2013-01-131-0/+6
|\ \ \ | | | | | | | | Adding tests for ActiveModel::Model
| * | | Adding tests for ActiveModel::ModelAttila Domokos2013-01-121-0/+6
| |/ / | | | | | | | | | | | | | | | * Verifying persisted? is false when Model initialized * Passing nil to Model should not blow up * Changing test name to the one suggested in pull request comment
* | | Merge pull request #8925 from colinbm/date_select_valueSteve Klabnik2013-01-133-1/+26
|\ \ \ | | |/ | |/| Allow to override the value on date_select
| * | Allow value to be set on date_selectColin Burn-Murdoch2013-01-133-1/+26
|/ /
* | Remove WIP from Working With JavaScript Guide.Steve Klabnik2013-01-131-1/+0
| | | | | | | | Now that we've fixed the fibs example, this is good to go.
* | Associaton -> AssociationSteve Klabnik2013-01-131-2/+2
|/
* Fix AR tests due to Mysql constant not being definedCarlos Antonio da Silva2013-01-123-7/+5
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 21:42:51 +0000