aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21153 from grosser/grosser/portsRafael Mendonça França2015-08-062-1/+24
|\ | | | | do not add common ports to HTTP_HOST
| * do not add common ports to HTTP_HOSTMichael Grosser2015-08-062-1/+24
| | | | | | | | | | - webservers do not do it - it makes redirect urls ugly when request.host is used for redirection
* | Merge pull request #20972 from vngrs/bin_updateRafael Mendonça França2015-08-063-1/+33
|\ \ | | | | | | Added bin/update script to update application automatically
| * | Added bin/update script to update application automaticallyMehmet Emin İNAÇ2015-08-073-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use system! fix changelog use bundle check first and use rake use system instead system! for bundle check
* | | Merge pull request #21154 from sobrinho/patch-1Rafael Mendonça França2015-08-061-1/+1
|\ \ \ | |_|/ |/| | Fix documentation on ActionDispatch::Request
| * | Fix documentation on ActionDispatch::RequestGabriel Sobrinho2015-08-061-1/+1
|/ /
* | use a request object to access info from env in GetIpAaron Patterson2015-08-062-11/+19
| | | | | | | | | | | | | | again, we want to hide the contents of `env` from the implementation. Allocate a request object to access the contents of env, but save allocations due to string literal allocations when accessing the env hash.
* | ask the request if we should show exceptionsAaron Patterson2015-08-063-4/+13
| | | | | | | | | | hide the env key in the request object so that other code doesn't need to know.
* | ExceptionWrapper doesn't need to know about `env`Aaron Patterson2015-08-064-26/+22
| | | | | | | | | | | | ExceptionWrapper only cares about the backtrace cleaner, so lets just pass the cleaner to the wrapper. It does not need to know that env exists or what key the backtrace cleaner is stored in
* | prevent string allocationsAaron Patterson2015-08-061-1/+1
| |
* | Merge pull request #20459Sean Griffin2015-08-063-0/+132
|\ \ | |/ |/|
| * Add missing data types for ActiveRecord migrationsMehmet Emin İNAÇ2015-06-083-0/+132
| |
* | reuse the request object in the File serving middlewareAaron Patterson2015-08-061-9/+13
| | | | | | | | | | | | | | Implement `serve` on the middleware. Nothing can be placed between the instance of FileHandler and Static because Static instantiates an instance of FileHandler. IOW there is no reason to implement the `call` API in this case.
* | get the underlying REQUEST_METHOD from the superclassAaron Patterson2015-08-061-1/+1
| |
* | use a request object to reduce string allocations and not know about ENV keysAaron Patterson2015-08-062-7/+8
| |
* | Merge pull request #21092 from vngrs/use_memoization_for_ids_readerRafael Mendonça França2015-08-062-2/+12
|\ \ | | | | | | Use memoization for collection associations ids reader
| * | Use memoization for collection associations ids readerMehmet Emin İNAÇ2015-08-032-2/+12
| | | | | | | | | | | | | | | | | | Fixes #21082 remove extra space
* | | Merge pull request #21022Rafael Mendonça França2015-08-062-3/+11
|\ \ \ | | | | | | | | | | | | Fix STATS_DIRECTORIES warning by only loading statistics.rake once
| * | | Only load statistics.rake once from inside engineErsin Akinci2015-08-062-3/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running rake stats from inside an engine, the engine's Rakefile attempts to reload statistics.rake after the test app loads it, which results in STATS_DIRECTORIES being redefined and an annoying warning. This patch skips loading statistics.rake from tasks.rb if rake's current scope isn't empty, i.e. if we are running from inside an engine and not the test app dir or a normal app. Fixes #20510.
* | | Merge pull request #21043 from ↵Rafael Mendonça França2015-08-062-0/+2
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/loading_fixtures_in_engine_integration_tests set the correct path to `ActionDispatch::IntegrationTest.fixture_path`
| * | | set the correct path to `ActionDispatch::IntegrationTest.fixture_path`yuuji.yaginuma2015-07-282-0/+2
| | | | | | | | | | | | | | | | | | | | `ActionDispatch::IntegrationTest.fixture_path` set by `test_help.rb`, but if the engine, path under the dummy is will be set, fixtures under test was not loaded.
* | | | Merge pull request #21061 from yui-knk/refactor/route_setRafael Mendonça França2015-08-061-4/+2
|\ \ \ \ | | | | | | | | | | Remove duplicated `Array#to_param`
| * | | | Remove duplicated `Array#to_param`yui-knk2015-08-011-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | `Array#to_param` is defind in active_support/core_ext/object/to_query.rb, so we can call `to_param` if value is_a Array.
* | | | | Merge pull request #21131 from eagletmt/percent-filenameRafael Mendonça França2015-08-063-1/+28
|\ \ \ \ \ | | | | | | | | | | | | Fix Encoding::UndefinedConversionError with multibyte UTF-8 filename containing "%" character
| * | | | | Assume uploaded filename is UTF-8Kohei Suzuki2015-08-051-1/+7
| | | | | |
| * | | | | Add failing spec on utf8 filename with percent characterKohei Suzuki2015-08-042-0/+21
| | | | | |
* | | | | | Merge pull request #15948 from MGerrior/fix_test_session_fetchRafael Mendonça França2015-08-063-0/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix test session fetch
| * | | | | | Adds missing argument handling for ActionController::TestSession toMatthew Gerrior2015-08-063-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | allow testing controllers that use session#fetch with a default value.
* | | | | | | Merge pull request #21149 from brendanwb/table_name_options-for-prRafael Mendonça França2015-08-061-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Better docs for ActiveRecord::Migration#table_name_options
| * | | | | | | better docs for ActiveRecord::Migration#table_name_optionsBrendan Buckingham2015-08-061-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #21150 from piton4eg/patch-4Rafael Mendonça França2015-08-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Small fix [ci skip]
| * | | | | | Small fixAlexey Markov2015-08-061-1/+1
|/ / / / / /
* | | | | | remove dead codeAaron Patterson2015-08-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't recycle requests anymore, so we shouldn't need to recycle cookie jars
* | | | | | ask the request for the cookie jarAaron Patterson2015-08-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | this prevents the middleware from knowing the specific key for the jar
* | | | | | add a setter for the cookie jarAaron Patterson2015-08-062-2/+8
| | | | | |
* | | | | | remove request reference from chained jarsAaron Patterson2015-08-061-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the chained jars to ask the parent jar for the request object which should eventually call back up to the original jar
* | | | | | Merge pull request #21137 from y-yagi/fix_deprecation_warningSantiago Pastorino2015-08-062-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | stop using deprecated `render :text` in railties
| * | | | | | stop using deprecated `render :text` in railtiesyuuji.yaginuma2015-08-062-2/+2
| | | | | | |
* | | | | | | Merge pull request #21143 from alietz/doc-correct-sass-instructionsYves Senn2015-08-061-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Documentation: correct instructions for using Sass with the asset pipeline [ci skip]
| * | | | | | | Corrected instructions for using SassAndreas Lietz2015-08-061-4/+4
| |/ / / / / /
* | | | | | | Merge pull request #21145 from toydestroyer/masterYves Senn2015-08-061-15/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Documentation: update queue_classic info in Active Job adapters list
| * | | | | | Documentation: update queue_classic info in Active Job adapters listSergey Toy2015-08-061-4/+3
|/ / / / / /
* | | | | | remove `@host` ivarAaron Patterson2015-08-052-13/+5
| | | | | |
* | | | | | remove @secure ivarAaron Patterson2015-08-052-7/+4
| | | | | |
* | | | | | CookieJar does not need the key_generator parameter anymoreAaron Patterson2015-08-052-5/+3
| | | | | |
* | | | | | eliminate key_generator ivarAaron Patterson2015-08-051-11/+14
| | | | | |
* | | | | | sop passing host and secure to the build methodAaron Patterson2015-08-052-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eventually we will make the cookie jar derive these values from the request object rather than save a reference to the values
* | | | | | stop using an options hash with the cookie jarAaron Patterson2015-08-052-39/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cookie jar can just ask the request object for the information it needs. This allows us to stop allocating hashes for options, and also allows us to delay calculating values in advance. Generating the options hash forced us to calculate values that we may never have needed at runtime
* | | | | | move env access to the request object.Aaron Patterson2015-08-053-16/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessing a request object has nice advantages over accessing a hash. If you use a missing method name, you'll get an exception rather than a `nil` (is one nice feature)
* | | | | | routes in the env via the request objectAaron Patterson2015-08-052-3/+6
| | | | | |