aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fix setting expected value in translation testsCarlos Antonio da Silva2013-01-211-2/+2
| | | | It was being set to nil instead due to the wrong assignment.
* Merge pull request #9007 from dpree/masterRafael Mendonça França2013-01-201-35/+46
|\ | | | | Enhanced tests for AbstractController::Translation module
| * Removed ActionController::Base dependency from abstract controller ↵Jens Bissinger2013-01-201-41/+46
| | | | | | | | translation tests.
| * Test abstract controller's localize method.Jens Bissinger2013-01-201-0/+6
| |
* | Refactor grep call to remove .eachCarlos Antonio da Silva2013-01-201-1/+1
| | | | | | | | Grep already yields the matching keys to the given block.
* | Add missing assert callsCarlos Antonio da Silva2013-01-201-2/+2
| |
* | Use 1.9 hash style in docs/comments [ci skip]Carlos Antonio da Silva2013-01-201-3/+3
| |
* | Fix markdown formatting to highlight block in changelog [ci skip]Carlos Antonio da Silva2013-01-201-2/+2
| |
* | Removing warning: shadowing outer local variable Arun Agrawal2013-01-201-3/+3
| |
* | strong parameters filters permitted scalarsXavier Noria2013-01-204-39/+273
|/
* Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependencyAaron Patterson2013-01-192-3/+9
|\ | | | | Remove i18n symbol dependency
| * Don't change the original i18n dataChris McGrath2013-01-171-1/+1
| |
| * Remove i18n symbol dependencyChris McGrath2013-01-172-3/+9
| | | | | | | | | | | | | | | | | | date.order is the only key in rails i18n that is required to be a symbol. This patch allows for symbols or strings which means: * No requirement for symbol type in .yml files. A future YAML.safe_load wouldn't need to load symbols * Rails could actually use json rather than yml as the backend
* | Restore and adapt the implementation reverted atRafael Mendonça França2013-01-194-37/+66
| | | | | | | | | | | | https://github.com/rails/rails/commit/cc1c3c5be061e7572018f734e5239750ab449e3f Now instead of raise, we log by default in development and test
* | Added ability to raise or log on unpermitted params.Thomas Drake-Brockman2013-01-204-6/+117
| |
* | Merge pull request #8977 from Soylent/masterAaron Patterson2013-01-182-1/+5
|\ \ | | | | | | Resovled issue rails#7774
| * | Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is empty stringKonstantin Papkovskiy2013-01-172-1/+5
| | |
* | | Fix syntax error :grin:Guillermo Iguaran2013-01-181-1/+1
| | |
* | | Remove "Application" section title from routesschneems2013-01-181-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | This PR standardizes the output of the HTML and console based routes to not include the title for "Application Routes" those that are defined by the application. Instead only routes defined in engines get any special treatment. Based on this conversation: https://github.com/rails/rails/commit/af5c0fd85fce1adb311083dd1ecf96432ee8caa3#commitcomment-2458823 ATP actionpack /cc @carlosantoniodasilva
* | | Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"Guillermo Iguaran2013-01-183-4/+4
| | | | | | | | | | | | | | | This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1.
* | | User Rails 4 find_byrobertomiranda2013-01-183-4/+4
|/ /
* | Remove useless || operationCarlos Antonio da Silva2013-01-172-3/+2
| |
* | Removing : warning: ambiguous first argument;Arun Agrawal2013-01-171-4/+4
|/
* Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_classCarlos Antonio da Silva2013-01-163-9/+58
| | | | Also add some generic tests to ensure they're properly deprecated.
* Fix date_select :selected option so you can pass it nilColin Burn-Murdoch2013-01-162-2/+65
|
* Remove warnings: "(...) interpreted as grouped expression"Carlos Antonio da Silva2013-01-161-2/+2
|
* adding regression test in master for #8631Aditya Sanghi2013-01-161-0/+21
|
* 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
| |
* | Remove header bloat introduced by BestStandardsSupport middlewareEdward Anderson2013-01-153-2/+10
|/ | | | The same headers were being duplicated on every request.
* 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 "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'`
* 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
* | 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.
* | Allow value to be set on date_selectColin Burn-Murdoch2013-01-133-1/+26
| |
* | Associaton -> AssociationSteve Klabnik2013-01-131-2/+2
|/
* Fix regression introduced in pull request 8812Sam Ruby2013-01-111-1/+2
| | | | See https://github.com/rails/rails/pull/8812#commitcomment-2416514
* Merge pull request #8882 from goshakkk/clearer-conditionalCarlos Antonio da Silva2013-01-111-3/+3
|\ | | | | Clearer conditional in constraint match check
| * clearer conditional in constraint match checkGosha Arinich2013-01-101-3/+3
| |
* | Merge pull request #8623 from virusman/form_helpers_collectionproxy_fixJon Leighton2013-01-112-1/+24
|\ \ | | | | | | Fixed nested fields bug when called with AssociationProxy
| * | Test nested fields with AssociationProxy mockup & fix AssociationProxy ↵virusman2012-12-272-1/+24
| | | | | | | | | | | | support in form helper
* | | Fix json params parsing regression for non-object JSON content.Dylan Smith2013-01-113-2/+13
| |/ |/| | | | | Fixes #8845.
* | Merge pull request #8876 from senny/extract_performance_testsGuillermo Iguaran2013-01-105-15/+7
|\ \ | | | | | | Extract ActionDispatch::PerformanceTest
| * | extract PerformanceTest into rails-performance_tests gemYves Senn2013-01-105-15/+7
| | |