aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| * | | | Use block variable instead of globalschneems2015-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby require 'benchmark/ips' Benchmark.ips do |x| x.report("$&") { "foo".sub(/f/) { $&.upcase } } x.report("block var") { "foo".sub(/f/) {|match| match.upcase } } end ``` ``` Calculating ------------------------------------- $& 48.658k i/100ms block var 49.666k i/100ms ------------------------------------------------- $& 873.156k (± 9.3%) i/s - 4.331M block var 969.744k (± 9.2%) i/s - 4.818M ``` It's faster, and gets rid of a few "magic" global variables
* | | | | Merge pull request #19094 from phoet/have_bearer_be_valid_as_wellRafael Mendonça França2015-06-013-2/+19
|\ \ \ \ \ | | | | | | | | | | | | Have Bearer be valid as well
| * | | | | add changelog entryphoet2015-06-011-0/+10
| | | | | |
| * | | | | allow `Bearer` as well as `Token`phoet2015-06-012-1/+8
| | | | | |
| * | | | | actually test what the name saysphoet2015-06-011-1/+1
| | | | | |
* | | | | | Merge pull request #20138 from tgxworld/deprecated_assert_templateRafael Mendonça França2015-06-0117-685/+114
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecate `assert_template` and `assigns()`.
| * | | | | | Remove `assigns` and `assert_template`.Guo Xiang Tan2015-05-3017-685/+114
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #20284 from kaspth/fix-caching-testRafael Mendonça França2015-06-013-3/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Move expectation to instance level.
| * | | | | Replace expectation with state check.Kasper Timm Hansen2015-05-303-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | The tests would still pass if the cache call in the rendered templates were removed.
* | | | | | Use `any?` rather than `present?` to check argseileencodes2015-05-312-2/+2
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | It's better to use Ruby methods when possible over methods defined by Active Support because then it does not need to rely on any dependencies.
* | | | | match method doc fix [ci skip]Mehmet Emin İNAÇ2015-05-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match method without setting `:via` option has been deprecated fix minor typo
* | | | | [ci skip] match without via is now deprecatedYoong Kang Lim2015-05-301-1/+1
| |/ / / |/| | |
* | | | Merge pull request #20358 from tgxworld/remove_codeSantiago Pastorino2015-05-291-2/+0
|\ \ \ \ | | | | | | | | | | Remove unused code.
| * | | | Remove unused code.Guo Xiang Tan2015-05-291-2/+0
| | | | | | | | | | | | | | | | | | | | Code was moved into the `assign` method.
* | | | | Fix warning about ambiguous first argumentArun Agrawal2015-05-291-1/+1
|/ / / /
* | | | Merge pull request #20341 from ↵Rafael Mendonça França2015-05-281-36/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vngrs/remove_already_defined_methods_in_rack_request Remove already defined methods in super class of ActionDispatch::Request class
| * | | | Remove already defined methods in super class of ActionDispatch::Request classMehmet Emin İNAÇ2015-05-281-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods had defined in 2004 by dhh in initial commit and `ActionDispatch::Request` class has been inherited from `Rack::Request` class in 2009 by josh. In 2014 these methods and more of them defined in `Rack::Request` class so we don't need them anymore in rails codebase.
* | | | | Merge pull request #20017 from eliotsykes/configurable-static-index-filenameRafael Mendonça França2015-05-287-4/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | config.static_index configures directory Index "index.html" filename
| * | | | | config.static_index configures directory index "index.html" filenameEliot Sykes2015-05-287-4/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Set `config.static_index` to serve a static directory index file not named `index`. For example, to serve `main.html` instead of `index.html` for directory requests, set `config.static_index` to `"main"`.
* | | | | Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasksRafael Mendonça França2015-05-281-7/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused package tasks
| * | | | | Remove unused package tasksArun Agrawal2015-05-281-7/+0
| |/ / / / | | | | | | | | | | | | | | | We are using `all:build` now.
* / / / / Deprecate `:nothing` option for render methodMehmet Emin İNAÇ2015-05-2810-13/+28
|/ / / / | | | | | | | | | | | | `head` method works similar to `render` method with `:nothing` option
* | | | Merge pull request #20329 from EduardoBautista/json-api-supportRafael Mendonça França2015-05-271-1/+1
|\ \ \ \ | | | | | | | | | | Add application/vnd.api+json alias to the JSON MIME Type.
| * | | | Add application/vnd.api+json alias to the JSON MIME Type.Eduardo Bautista2015-05-271-1/+1
| | | | |
* | | | | Merge pull request #19808 from byroot/action-parameterRafael Mendonça França2015-05-272-15/+32
|\ \ \ \ \ | | | | | | | | | | | | [PoC] Stop shadowing parameters named `action`
| * | | | | Allow to parameters named `action` or `controller` from AC::TestCase helpersJean Boussier2015-04-182-15/+32
| | | | | |
* | | | | | Merge pull request #20316 from ↵Rafael Mendonça França2015-05-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vngrs/add_assertion_for_get_method_into_request_test Add assertion for get? method into test cases
| * | | | | | Add assertion for get? method into test casesMehmet Emin İNAÇ2015-05-271-0/+1
| | | | | | |
* | | | | | | Documentation for ActionDispatch::Request form_data? method [ci skip]Mehmet Emin İNAÇ2015-05-271-0/+2
|/ / / / / /
* | | | | | Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-taskYves Senn2015-05-271-7/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove broken and unused release task
| * | | | | | Remove broken and unused release taskArun Agrawal2015-05-221-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter`
* | | | | | | Add missing nodocs and docs for ActionDispatch::Request [ci skip]Mehmet Emin İNAÇ2015-05-261-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | add missing dot to end of the doc
* | | | | | | Use memoization while accessing request headers for minimizing memory usageMehmet Emin İNAÇ2015-05-251-1/+1
| |_|/ / / / |/| | | | |
* | | | | | remove useless ivarAaron Patterson2015-05-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | I should have deleted this earlier with 42e66fac38b54dd53d062fb5d3376218ed2ffdae
* | | | | | add a branch to eliminate multiple nil checksAaron Patterson2015-05-231-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we add an else conditional to the `presence` check, we can eliminate the second `||` branch in the caller
* | | | | | move request id manipulation to the request objectAaron Patterson2015-05-222-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | this way we can keep the knowledge of `env` hash keys in one place.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 02:41:40 +0000