aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Lets kepp using Ruby 1.9 syntaxRafael Mendonça França2013-01-222-37/+37
|
* Only check for unpermmited parameters ifRafael Mendonça França2013-01-221-1/+1
| | | | action_on_unpermitted_parameters is present
* avoid creating an object in every callXavier Noria2013-01-221-1/+2
| | | | This was a suggestion of @carlosantoniodasilva, thanks!
* Remove tabs, use spaces :scissors:Carlos Antonio da Silva2013-01-221-2/+2
| | | | [ci skip]
* Merge branch 'isolating_tests'Akira Matsuda2013-01-222-2/+12
|\ | | | | | | Now we're almost ready to remove this: https://github.com/rails/rails/blob/5294ad8/activesupport/lib/active_support/test_case.rb#L29
| * Restore I18n.locale after running testsAkira Matsuda2013-01-221-1/+7
| |
| * Make sure to reset default_url_optionsAkira Matsuda2013-01-221-1/+5
| |
* | Stylistic pass at form_helper_testRafael Mendonça França2013-01-211-286/+362
| |
* | Capture block so content won't leak.José Mota2013-01-213-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The [following pull request](https://github.com/rails/rails/pull/8916) fixed the block being passed to the appropriate helper method. However, the content being passed into the block is generating repeated markup on the page due to some weird ERb evaluation. This commit tries to capture the block's generated output so the page isn't flooded with markup. [Rafael França + José Mota] Closes #8936
* | Update actionpack's CHANGELOG for 445f14ePiotr Sarnacki2013-01-211-0/+5
| |
* | Fix asset_path in mounted enginePiotr Sarnacki2013-01-211-2/+1
|/ | | | | | | | | | | | | Historically serving assets from a mountable engine could be achieved by running ActionDispatch::Static as a part of engine middleware stack or to copy assets prefixed with an engine name. After introduction of assets pipeline this is not needed as all of the assets are served or compiled into main application's assets. This commit removes the obsolete line making asset_path always generate paths relative to the root or config.relative_url_root if it's set. (closes #8119)
* Duplicate possible frozen string from routeAndrew White2013-01-212-2/+12
| | | | | | | | | | | | | Ruby 1.9 freezes Hash string keys by default so where a route is defined like this: get 'search' => 'search' then the Mapper will derive the action from the key. This blows up later when the action is added to the parameters hash and the encoding is forced. Closes #3429
* Merge pull request #9014 from virusman/form_helpers_ar_testsRafael Mendonça França2013-01-212-0/+92
|\ | | | | AR integration tests for form helpers
| * Added AR integration tests for form helpersvirusman2013-01-212-0/+92
| |
* | Merge pull request #9001 from schneems/schneems/routes-path-jsRafael Mendonça França2013-01-215-12/+134
|\ \ | | | | | | In Browser Path Matching with Javascript
| * | In Browser Path Matching with Javascriptschneems2013-01-205-12/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When debugging routes ,it can sometimes be difficult to understand exactly how the paths are matched. This PR adds a JS based path matching widget to the `/rails/info/routes` output. You can enter in a path, and it will tell you which of the routes that path matches, while preserving order (top match wins). The matching widget in action: ![](http://f.cl.ly/items/3A2F0v2m3m1Z1p3P3O3k/path-match.gif) Prior to this PR the only way to check matching paths is via mental math, or typing in a path in the url bar and seeing where it goes. This feature will be an invaluable debugging tool by dramatically decreasing the time needed to check a path match. ATP actionpack
* | | 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.