Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21156 from yui-knk/fix/guide_instumentation | Matthew Draper | 2015-08-07 | 1 | -8/+0 |
|\ | | | | | [ci skip] Remove `identity.active_record` | ||||
| * | [ci skip] Remove `identity.active_record` | yui-knk | 2015-08-07 | 1 | -8/+0 |
|/ | | | | | This is removed by this commit cf: https://github.com/rails/rails/pull/5261 | ||||
* | Merge pull request #21155 from AaronLasseigne/fewer_objects | Richard Schneeman | 2015-08-06 | 1 | -1/+1 |
|\ | | | | | Speed up code and avoid unnecessary MatchData objects | ||||
| * | speed up code and avoid unnecessary MatchData objects | Aaron Lasseigne | 2015-08-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #21153 from grosser/grosser/ports | Rafael Mendonça França | 2015-08-06 | 2 | -1/+24 |
|\ \ | | | | | | | do not add common ports to HTTP_HOST | ||||
| * | | do not add common ports to HTTP_HOST | Michael Grosser | 2015-08-06 | 2 | -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_update | Rafael Mendonça França | 2015-08-06 | 3 | -1/+33 |
|\ \ | | | | | | | Added bin/update script to update application automatically | ||||
| * | | Added bin/update script to update application automatically | Mehmet Emin İNAÇ | 2015-08-07 | 3 | -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-1 | Rafael Mendonça França | 2015-08-06 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fix documentation on ActionDispatch::Request | ||||
| * | | Fix documentation on ActionDispatch::Request | Gabriel Sobrinho | 2015-08-06 | 1 | -1/+1 |
|/ / | |||||
* | | use a request object to access info from env in GetIp | Aaron Patterson | 2015-08-06 | 2 | -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 exceptions | Aaron Patterson | 2015-08-06 | 3 | -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 Patterson | 2015-08-06 | 4 | -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 allocations | Aaron Patterson | 2015-08-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #20459 | Sean Griffin | 2015-08-06 | 3 | -0/+132 |
|\ \ | |/ |/| | |||||
| * | Add missing data types for ActiveRecord migrations | Mehmet Emin İNAÇ | 2015-06-08 | 3 | -0/+132 |
| | | |||||
* | | reuse the request object in the File serving middleware | Aaron Patterson | 2015-08-06 | 1 | -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 superclass | Aaron Patterson | 2015-08-06 | 1 | -1/+1 |
| | | |||||
* | | use a request object to reduce string allocations and not know about ENV keys | Aaron Patterson | 2015-08-06 | 2 | -7/+8 |
| | | |||||
* | | Merge pull request #21092 from vngrs/use_memoization_for_ids_reader | Rafael Mendonça França | 2015-08-06 | 2 | -2/+12 |
|\ \ | | | | | | | Use memoization for collection associations ids reader | ||||
| * | | Use memoization for collection associations ids reader | Mehmet Emin İNAÇ | 2015-08-03 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | Fixes #21082 remove extra space | ||||
* | | | Merge pull request #21022 | Rafael Mendonça França | 2015-08-06 | 2 | -3/+11 |
|\ \ \ | | | | | | | | | | | | | Fix STATS_DIRECTORIES warning by only loading statistics.rake once | ||||
| * | | | Only load statistics.rake once from inside engine | Ersin Akinci | 2015-08-06 | 2 | -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ça | 2015-08-06 | 2 | -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.yaginuma | 2015-07-28 | 2 | -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_set | Rafael Mendonça França | 2015-08-06 | 1 | -4/+2 |
|\ \ \ \ | | | | | | | | | | | Remove duplicated `Array#to_param` | ||||
| * | | | | Remove duplicated `Array#to_param` | yui-knk | 2015-08-01 | 1 | -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-filename | Rafael Mendonça França | 2015-08-06 | 3 | -1/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix Encoding::UndefinedConversionError with multibyte UTF-8 filename containing "%" character | ||||
| * | | | | | Assume uploaded filename is UTF-8 | Kohei Suzuki | 2015-08-05 | 1 | -1/+7 |
| | | | | | | |||||
| * | | | | | Add failing spec on utf8 filename with percent character | Kohei Suzuki | 2015-08-04 | 2 | -0/+21 |
| | | | | | | |||||
* | | | | | | Merge pull request #15948 from MGerrior/fix_test_session_fetch | Rafael Mendonça França | 2015-08-06 | 3 | -0/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix test session fetch | ||||
| * | | | | | | Adds missing argument handling for ActionController::TestSession to | Matthew Gerrior | 2015-08-06 | 3 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow testing controllers that use session#fetch with a default value. | ||||
* | | | | | | | Merge pull request #21149 from brendanwb/table_name_options-for-pr | Rafael Mendonça França | 2015-08-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Better docs for ActiveRecord::Migration#table_name_options | ||||
| * | | | | | | | better docs for ActiveRecord::Migration#table_name_options | Brendan Buckingham | 2015-08-06 | 1 | -1/+3 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #21150 from piton4eg/patch-4 | Rafael Mendonça França | 2015-08-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Small fix [ci skip] | ||||
| * | | | | | | Small fix | Alexey Markov | 2015-08-06 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | remove dead code | Aaron Patterson | 2015-08-06 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't recycle requests anymore, so we shouldn't need to recycle cookie jars | ||||
* | | | | | | ask the request for the cookie jar | Aaron Patterson | 2015-08-06 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | this prevents the middleware from knowing the specific key for the jar | ||||
* | | | | | | add a setter for the cookie jar | Aaron Patterson | 2015-08-06 | 2 | -2/+8 |
| | | | | | | |||||
* | | | | | | remove request reference from chained jars | Aaron Patterson | 2015-08-06 | 1 | -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_warning | Santiago Pastorino | 2015-08-06 | 2 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | stop using deprecated `render :text` in railties | ||||
| * | | | | | | stop using deprecated `render :text` in railties | yuuji.yaginuma | 2015-08-06 | 2 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #21143 from alietz/doc-correct-sass-instructions | Yves Senn | 2015-08-06 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Documentation: correct instructions for using Sass with the asset pipeline [ci skip] | ||||
| * | | | | | | | Corrected instructions for using Sass | Andreas Lietz | 2015-08-06 | 1 | -4/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #21145 from toydestroyer/master | Yves Senn | 2015-08-06 | 1 | -15/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Documentation: update queue_classic info in Active Job adapters list | ||||
| * | | | | | | Documentation: update queue_classic info in Active Job adapters list | Sergey Toy | 2015-08-06 | 1 | -4/+3 |
|/ / / / / / | |||||
* | | | | | | remove `@host` ivar | Aaron Patterson | 2015-08-05 | 2 | -13/+5 |
| | | | | | | |||||
* | | | | | | remove @secure ivar | Aaron Patterson | 2015-08-05 | 2 | -7/+4 |
| | | | | | | |||||
* | | | | | | CookieJar does not need the key_generator parameter anymore | Aaron Patterson | 2015-08-05 | 2 | -5/+3 |
| | | | | | | |||||
* | | | | | | eliminate key_generator ivar | Aaron Patterson | 2015-08-05 | 1 | -11/+14 |
| | | | | | |