aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #23216 from prathamesh-sonpatki/fix-23137Matthew Draper2016-01-242-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Rails::Generators::Actions#gem should work even if frozen string is passed as...Prathamesh Sonpatki2016-01-242-1/+9
|/ / / / / / / / / / /
* / / / / / / / / / / Add environment back to db:structure:loadAndrew White2016-01-231-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23102 from yui-knk/foreign_type_to_singular_associationEileen M. Uchitelle2016-01-233-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Define `:foreign_type` as a valid option in `SingularAssociation`yui-knk2016-01-193-3/+3
* | | | | | | | | | | Use the database type to deserialize enumSean Griffin2016-01-234-4/+19
* | | | | | | | | | | Document scoping issue with Time.use_zoneAndrew White2016-01-231-1/+17
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #23206 from joyvuu-dave/action_cable_api_fixKasper Timm Hansen2016-01-232-1/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | prevent --skip-action-cable from erroring when --api option is usedDave Riddle2016-01-222-1/+13
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23207 from y-yagi/fix_path_of_actioncable_configप्रथमेश Sonpatki2016-01-231-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix path of Action Cable configuration file [ci skip]yuuji.yaginuma2016-01-231-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-01-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] An internal link is an relative pathyui-knk2015-12-231-1/+1
* | | | | | | | | | Merge pull request #23201 from dkniffin/patch-1Jon Moss2016-01-221-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move ApplicationCable::Channel section of readmeDerek Kniffin2016-01-221-7/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23126 from Gaurav2728/implement_rake_to_rails_taks_in_docJon Moss2016-01-221-43/+62
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rails 5.0+ rake commands implemented in Rails Framework itself. We prefer to ...Gaurav Sharma2016-01-221-43/+62
* | | | | | | | | | | Merge pull request #23194 from britg/patch-2Matthew Draper2016-01-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use the correct reference to the redis connectionBrit Gardner2016-01-221-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23177 from vipulnsward/testing-pass-1Jon Moss2016-01-221-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | First pass over parts of Testing guideVipul A M2016-01-221-7/+7
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23182 from palkan/add-docs-tsrangeJon Moss2016-01-221-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Add note about tsrange and timezone awareness to docspalkan2016-01-221-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23178 from vipulnsward/rm-changelogAndrew White2016-01-221-4/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rm changelog for unreleased changes fixesVipul A M2016-01-221-4/+0
* | | | | | | | | | Merge pull request #23180 from y-yagi/remove_per_form_csrf_tokens_initializer...Andrew White2016-01-222-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | remove `per_form_csrf_tokens` initializer from Rails APIyuuji.yaginuma2016-01-222-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23174 from JuanitoFatas/followup-skip-action-cableKasper Timm Hansen2016-01-222-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove action_cable_meta_tag when skip action_cableJuanitoFatas2016-01-222-0/+4
* | | | | | | | | | Merge pull request #23175 from maclover7/add-ac-appgen-testKasper Timm Hansen2016-01-221-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Add `config/cable.yml` to list of default files in Rails generatorJon Moss2016-01-211-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #23080 from prathamesh-sonpatki/fix-cache-key-for-loaded-e...Matthew Draper2016-01-222-1/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix ActiveRecord::Relation#cache_key for loaded empty collectionPrathamesh Sonpatki2016-01-162-1/+11
* | | | | | | | | Merge pull request #23167 from maclover7/fix-21032Rafael França2016-01-213-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix `ActionController::Parameters#==` bugJon Moss2016-01-213-1/+15
* | | | | | | | | | Merge pull request #23078 from y-yagi/add_application_mailer_rb_to_mountable_...Rafael França2016-01-214-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | allow symbol to end of string in `wrap_in_modules`yuuji.yaginuma2016-01-162-5/+5
| * | | | | | | | | | add application_mailer.rb to template of mountable engineyuuji.yaginuma2016-01-153-0/+11
* | | | | | | | | | | Merge pull request #23165 from shakib609/fix-23157Jon Moss2016-01-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] fix #23157Shakib Hossain2016-01-221-0/+5
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Use bind parameters for ranges in where clausesSean Griffin2016-01-212-2/+36
* | | | | | | | | | | Merge pull request #23164 from vipulnsward/warning-from-renderers-testKasper Timm Hansen2016-01-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | - Fix warning introduced in https://github.com/vipulnsward/rails/commit/77acc...Vipul A M2016-01-221-1/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23156 from plentz/patch-1Guillermo Iguaran2016-01-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | updating secrets.yml template to use rails command instead of rakeDiego Plentz2016-01-211-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23154 from sealocal/improve-docs-for-respond-toप्रथमेश Sonpatki2016-01-211-4/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove doc reference to ActionController::MimeResponds#respond_tosealocal2016-01-201-3/+0
| * | | | | | | | | | document simple example of ActionController::MimeResponds#respond_tosealocal2016-01-201-1/+9
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23149 from maclover7/fix-23142Santiago Pastorino2016-01-214-1/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Re-add ActionController::ApiRenderingJon Moss2016-01-204-1/+39
| | |/ / / / / / / / | |/| | | | | | | |