aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fix flakyness.Kasper Timm Hansen2015-06-151-0/+1
| | | | Brought on by my own stupidity :)
* A few documentation edits [ci skip]Robin Dupret2015-06-152-10/+12
|
* quick pass over changelogs. [ci skip]Yves Senn2015-06-151-4/+4
|
* Merge pull request #20559 from mtsmfm/fix-header-modification-by-sslGuillermo Iguaran2015-06-142-1/+12
|\ | | | | ActionDispatch::SSL should keep original header's behavior
| * ActionDispatch::SSL should keep original header's behaviorFumiaki MATSUSHIMA2015-06-142-1/+12
| | | | | | | | | | | | `ActionDispatch::SSL` changes headers to `Hash`. So some headers will be broken if there are some middlewares on ActionDispatch::SSL and if it uses `Rack::Utils::HeaderHash`.
* | Merge pull request #20558 from prathamesh-sonpatki/missing-header-wordKasper Timm Hansen2015-06-141-1/+1
|\ \ | |/ |/| Add missing "header" word in documentation of Token#authentication_request [ci skip]
| * Add missing "header" word in documentation of Token#authentication_request ↵Prathamesh Sonpatki2015-06-141-1/+1
| | | | | | | | [ci skip]
* | don't hold a reference to `env` in the options objectAaron Patterson2015-06-131-13/+11
| | | | | | | | | | I want to decouple Rails from the rack ENV as much as possible. We should try to keep as few references to the env as possible
* | Handle param-parsing errors from Rack in ExceptionWrapperGrey Baker2015-06-122-1/+9
|/
* Merge pull request #20480 from senny/test_runnerYves Senn2015-06-121-0/+4
|\ | | | | use our own runner for Rails framework components `bin/test`
| * select the AR adapter through `bin/test`.Yves Senn2015-06-111-0/+1
| |
| * use our runner (`bin/test`) for framework components.Yves Senn2015-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | This adds a script `bin/test` to most Rails framework components. The script uses the rails minitest plugin to augment the runner. See https://github.com/rails/rails/pull/19571 for details about the plugin. I did not yet add `bin/test` for activerecord, activejob and railties. These components rely on specific setup performed in the rake-tasks.
* | Update RDoc for ActionController::TestCase for kwargs.Victor Costan2015-06-121-1/+1
| |
* | Merge pull request #20522 from colby-swandale/doc-updateSean Griffin2015-06-111-1/+1
|\ \ | | | | | | fixed sring to be string in ActiveRecord::Base params documentation [ci skip]
| * | fixed sring to be string in ActiveRecord::Base params documentationColby Swandale2015-06-121-1/+1
| | |
* | | Mention that doing nothing in Rails API controllers returns 204Santiago Pastorino2015-06-111-1/+1
| | |
* | | Return 204 if render is not called in API controllersJorge Bejar2015-06-115-6/+31
| | |
* | | Add test coverage for implicit render in empty actionsJorge Bejar2015-06-111-0/+14
| | |
* | | Include ParamsWrapper in AC::APIJorge Bejar2015-06-112-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | ParamsWrapper was initially removed from API controllers according to the following discusision: https://github.com/rails-api/rails-api/issues/33 However, we're including it again so Rails API devs can decide whether to enable or disable it.
* | | Add CHANGELOG entries for API apps functionalitySantiago Pastorino2015-06-111-0/+6
| | |
* | | Fix MimeResponds example in AC::API documentationSantiago Pastorino2015-06-111-3/+5
| | |
* | | Revert changes related with api apps in RouteWrapperJorge Bejar2015-06-111-11/+1
| | | | | | | | | | | | | | | See the following commit to have context about this change: https://github.com/rails/rails/commit/757a2bc3e3e52a5d9418656928db993db42b741b
* | | Rename test methods in api conditional get controller testsJorge Bejar2015-06-111-2/+2
| | |
* | | Do not say that Api Controllers are faster than regular ones in docsJorge Bejar2015-06-111-4/+4
| | |
* | | Remove Compatibility module since we don't remember why it was added :smile:Jorge Bejar2015-06-112-20/+0
| | |
* | | Routes resources avoid :new and :edit endpoints if api_only is enabledJorge Bejar2015-06-113-12/+110
| | |
* | | Remove extra whitespacesSantiago Pastorino2015-06-111-1/+1
| | |
* | | Use new hash syntaxSantiago Pastorino2015-06-112-7/+7
| | |
* | | Refactor internal? to query internal_controller? and internal_asset? methodsSantiago Pastorino2015-06-111-1/+11
| | |
* | | Remove Unneeded ApiPublicExceptions middleware, PublicExceptions already ↵Santiago Pastorino2015-06-113-84/+0
| | | | | | | | | | | | does the work
* | | Remove api_rendering is not neededSantiago Pastorino2015-06-113-19/+1
| | |
* | | Adhere to Rails convention for private indentationSantiago Pastorino2015-06-111-21/+20
| | |
* | | Use nex hash syntax on testsSantiago Pastorino2015-06-111-5/+5
| | |
* | | Add ApiPublicException middlewareSantiago Pastorino2015-06-113-2/+87
| | |
* | | Move Model test class inside RenderersApiController namespaceSantiago Pastorino2015-06-111-8/+8
| | |
* | | Add ActionController API functionalitySantiago Pastorino2015-06-1110-0/+360
| | |
* | | Merge pull request #20519 from colby-swandale/doc-updateZachary Scott2015-06-111-3/+3
|\| | | | | | | | better clarity of params source in ActionController::Base documentation
| * | better clarity of params source in ActionController::Base documentation [ci ↵Colby Swandale2015-06-111-3/+3
| |/ | | | | | | skip]
* / Change the `index` arg of `ActionDispatch::Static#new` to a kwargYuki Nishijima2015-06-112-5/+4
|/
* remove unused codeAaron Patterson2015-06-081-2/+2
|
* we only care about methods that the request object responds toAaron Patterson2015-06-081-2/+1
| | | | | matches? should only deal with methods on the request object, so lets just filter out anything that the request object doesn't respond to
* extract required_defaults from the conditions hash before constructing the routeAaron Patterson2015-06-086-56/+56
| | | | | this way we can remove the strange "respond_to?" conditional in the `matches?` loop
* Add missing documentation for ActionDispatch::Request::Session [ci skip]Mehmet Emin İNAÇ2015-06-071-0/+33
|
* A few documentation tweaks [ci skip]Robin Dupret2015-06-071-2/+2
| | | | [Robin Dupret & Shunsuke Aida]
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-051-1/+1
|\
| * [ci skip] Upcase `is`yui-knk2015-05-251-1/+1
| |
* | pass check_ip and proxies to GetIp constructorAaron Patterson2015-06-031-4/+4
| | | | | | | | | | The `GetIp` class doesn't need to keep a reference to the middleware, so there is no reason to pass the middleware instance to the `GetIp` class
* | Merge pull request #20383 from jonatack/fix-configurable-static-index-filenameSantiago Pastorino2015-06-021-3/+3
|\ \ | | | | | | Fix regression in #20017 wrong number of arguments error
| * | Fix regression in #20017: wrong number of arguments errorJon Atack2015-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and use coherent quoting/spacing. This should hopefully fix a regression that was introduced with #20017, causing deployment pushes to Heroku to be rejected with the following trace: ArgumentError: wrong number of arguments (2 for 3) remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tatic.rb:16:in `initialize' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in `new' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in `initialize' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:43:in `new' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:43:in `build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `block in build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `each' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `inject' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/engine.rb:509:in `app' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application/finisher.rb: 34:in `block in <module:Finisher>' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in `instance_exec' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in `run' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:55:in `block in run_initializers' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:54:in `run_initializers' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application.rb:352:in `initialize!' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/config/environment.rb:5:in `<top (required)>'
* | | Merge pull request #20410 from schneems/schneems/boo-global-varsRafael Mendonça França2015-06-011-1/+1
|\ \ \ | | | | | | | | Use block variable instead of global