aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #21022Rafael Mendonça França2015-08-062-3/+11
|\ \ \ \
| * | | | Only load statistics.rake once from inside engineErsin Akinci2015-08-062-3/+11
|/ / / /
* | | | Merge pull request #21043 from y-yagi/loading_fixtures_in_engine_integration_...Rafael Mendonça França2015-08-062-0/+2
|\ \ \ \
| * | | | set the correct path to `ActionDispatch::IntegrationTest.fixture_path`yuuji.yaginuma2015-07-282-0/+2
* | | | | Merge pull request #21061 from yui-knk/refactor/route_setRafael Mendonça França2015-08-061-4/+2
|\ \ \ \ \
| * | | | | Remove duplicated `Array#to_param`yui-knk2015-08-011-4/+2
* | | | | | Merge pull request #21131 from eagletmt/percent-filenameRafael Mendonça França2015-08-063-1/+28
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | Adds missing argument handling for ActionController::TestSession toMatthew Gerrior2015-08-063-0/+23
* | | | | | | 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_optionsBrendan Buckingham2015-08-061-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #21150 from piton4eg/patch-4Rafael Mendonça França2015-08-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Small fixAlexey Markov2015-08-061-1/+1
|/ / / / / /
* | | | | | remove dead codeAaron Patterson2015-08-061-5/+0
* | | | | | ask the request for the cookie jarAaron Patterson2015-08-061-1/+8
* | | | | | add a setter for the cookie jarAaron Patterson2015-08-062-2/+8
* | | | | | remove request reference from chained jarsAaron Patterson2015-08-061-22/+25
* | | | | | Merge pull request #21137 from y-yagi/fix_deprecation_warningSantiago Pastorino2015-08-062-2/+2
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Corrected instructions for using SassAndreas Lietz2015-08-061-4/+4
| |/ / / / / /
* | | | | | | Merge pull request #21145 from toydestroyer/masterYves Senn2015-08-061-15/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
* | | | | | stop using an options hash with the cookie jarAaron Patterson2015-08-052-39/+31
* | | | | | move env access to the request object.Aaron Patterson2015-08-053-16/+48
* | | | | | 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
* | | | | | Add missing HelloJob require.Kasper Timm Hansen2015-08-051-0/+1
* | | | | | 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 rake dev:cache task to enable dev mode caching.Chuck Callebs2015-08-047-2/+114
* | | | | | | 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]`Ryuta Kamizono2015-08-041-1/+1
* | | | | | | Merge pull request #20800 from xijo/make_active_job_locale_awareKasper Timm Hansen2015-08-0411-2/+111
|\ \ \ \ \ \ \
| * | | | | | | Fixes #20799Johannes Opper2015-08-0411-2/+111
* | | | | | | | Merge pull request #21076 from r11runner/guide-join-tablesClaudio B.2015-08-032-10/+21
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [ci skip] migration and association guides: added some remarks about join tablesr11runner2015-08-042-10/+21
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #21105 from os97673/allow-minitest-pluginsRafael Mendonça França2015-08-031-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow Minitest to load plugins. Fixes #21102Oleg Sukhodolsky2015-08-031-0/+1
* | | | | | | | Merge pull request #21109 from vngrs/update_javascript_manifest_docKasper Timm Hansen2015-08-032-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Inform user to add script in correct location into the application.js manifes...Mehmet Emin İNAÇ2015-08-032-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #21087 from vngrs/fix_hash_except_docKasper Timm Hansen2015-08-031-8/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the documentation of Hash#except method [ci skip]Mehmet Emin İNAÇ2015-08-031-8/+9