aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| | | | | |
* | | | | | allocate a request object to avoid hash allocationsAaron Patterson2015-08-052-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This decouples the `call` method from knowing the SCRIPT_NAME key and offloads decisions about how to access script_name
* | | | | | Add missing HelloJob require.Kasper Timm Hansen2015-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This way JobSerializationTest runs in isolation without errors.
* | | | | | Use exist? instead of deprecated exists?Kasper Timm Hansen2015-08-051-2/+2
| | | | | |
* | | | | | Merge pull request #20961 from ccallebs/add-dev-mode-cachingKasper Timm Hansen2015-08-057-2/+114
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add dev caching toggle / server options
| * | | | | | Add rake dev:cache task to enable dev mode caching.Chuck Callebs2015-08-047-2/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taken from @Sonopa's commits on PR #19091. Add support for dev caching via "rails s" flags. Implement suggestions from @kaspth. Remove temporary cache file if server does not have flags. Break at 80 characters in railties/CHANGELOG.md Remove ability to disable cache based on server options. Add more comprehensive options: --dev-caching / --no-dev-caching
* | | | | | | Merge pull request #21112 from kamipo/fix_mysql2_versionRafael Mendonça França2015-08-041-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Should use `server_info[:version]` instead of `info[:version]`
| * | | | | | Should use `server_info[:version]` instead of `info[:version]`Ryuta Kamizono2015-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `info[:version]` is a client version, the server version is `server_info[:version]`.
* | | | | | | Merge pull request #20800 from xijo/make_active_job_locale_awareKasper Timm Hansen2015-08-0411-2/+111
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make ActiveJob locale aware
| * | | | | | | Fixes #20799Johannes Opper2015-08-0411-2/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `#perform_later` is called the locale isn't stored on the queue, which results in a locale reset when the job is performed. An example of the problem: I18n.locale = 'de' HelloJob.perform_now # german message, correct but I18n.locale = 'de' HelloJob.perform_later # english message, incorrect This PR attaches the current I18n.locale to every job during the serialization process. It is then restored during deserialization and used to perform the job with the correct locale. It falls back to the default locale if no serialized locale is found in order to provide backward compatibility with previously stored jobs. It is not necessary to clear the queue for the update.
* | | | | | | | Merge pull request #21076 from r11runner/guide-join-tablesClaudio B.2015-08-032-10/+21
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | migration and association guides: added some remarks about join tables
| * | | | | | | [ci skip] migration and association guides: added some remarks about join tablesr11runner2015-08-042-10/+21
| | |/ / / / / | |/| | | | |