aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Fix typos and add a few suggestionsFatos Morina2017-11-2813-27/+41
|/ / / / /
* | | | | Merge pull request #31261 from rails/fix-relative-url-root-with-optimized-url...Andrew White2017-11-283-0/+54
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix optimized url helpers when using relative url rootAndrew White2017-11-283-0/+54
| |/ / /
* | | | Merge pull request #31255 from dixitp012/update_action_controller_guideRyuta Kamizono2017-11-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Update MVC wiki linkDixit Patel2017-11-281-1/+1
|/ / /
* | | Use same version constraint in mysql adapter and generated applicationyuuji.yaginuma2017-11-282-2/+2
* | | Merge pull request #31248 from y-yagi/fix_31245Rafael França2017-11-271-1/+1
|\ \ \
| * | | Include migration files in gemyuuji.yaginuma2017-11-281-1/+1
* | | | Change how `AttributeSet::Builder` receives its defaultsSean Griffin2017-11-274-20/+21
|/ / /
* | | Drop mysql2 version less than 0.4.3 to guarantee fork safety (#31244)Ryuta Kamizono2017-11-281-1/+1
* | | Merge pull request #31243 from ignat-z/patch-1Rafael França2017-11-271-8/+6
|\ \ \
| * | | [ci skip] Fix documentation for deprecation method_wrappersIgnat Zakrevsky2017-11-271-8/+6
* | | | Add releases notes to the guides indexRafael Mendonça França2017-11-271-0/+4
* | | | Preparing for 5.2.0.beta1 releaseRafael Mendonça França2017-11-2727-59/+83
* | | | Merge pull request #31242 from fgo/patch-22Rafael França2017-11-271-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Update Rails on Rack guide [ci skip]Francis Go2017-11-271-2/+2
* | | | Update yarn lockRafael Mendonça França2017-11-271-10/+0
* | | | Merge pull request #31237 from prathamesh-sonpatki/5-2-release-notesRafael França2017-11-271-0/+210
|\ \ \ \
| * | | | Added CSP as major feature [ci skip]Prathamesh Sonpatki2017-11-271-0/+5
| * | | | Added first draft of Rails 5.2 release notes [ci skip]Prathamesh Sonpatki2017-11-271-0/+205
* | | | | Make form_with_generates_ids default value to be falseRafael Mendonça França2017-11-273-5/+10
* | | | | Remove Content-Security-Policy initializer in API-only Applicationsyuuji.yaginuma2017-11-272-0/+8
| |_|_|/ |/| | |
* | | | Update the middleware list with CSP [ci skip]Prathamesh Sonpatki2017-11-271-0/+1
* | | | Merge pull request #31238 from prathamesh-sonpatki/csp-initializer-testAndrew White2017-11-271-0/+1
|\ \ \ \
| * | | | Added missing test for presence of CSP initializerPrathamesh Sonpatki2017-11-271-0/+1
| |/ / /
* | | | Merge pull request #31239 from prathamesh-sonpatki/fix-changelog-for-cspAndrew White2017-11-271-10/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Fix CHANGELOG for CSP PR #31162 [ci skip]Prathamesh Sonpatki2017-11-271-10/+10
|/ / /
* | | Add CHANGELOG.md entry for #31162 [ci skip]Andrew White2017-11-271-0/+60
* | | Merge pull request #31162 from rails/add-csp-configAndrew White2017-11-2713-34/+886
|\ \ \
| * | | Add DSL for configuring Content-Security-Policy headerAndrew White2017-11-2713-34/+886
* | | | Enable `Style/DefWithParentheses` rubocop ruleRyuta Kamizono2017-11-275-4/+7
|/ / /
* | | Merge pull request #31236 from y-yagi/use_puma_311_in_new_appsGuillermo Iguaran2017-11-272-2/+2
|\ \ \
| * | | Use Puma 3.11 in newly generated applicationsyuuji.yaginuma2017-11-272-2/+2
|/ / /
* | | Merge pull request #31167 from albertoalmagro/clean-db-ambiguityRafael França2017-11-261-2/+2
|\ \ \
| * | | Remove DB naming ambiguityAlberto Almagro2017-11-261-2/+2
* | | | Add new error class `QueryCanceled` which will be raised when canceling state...Ryuta Kamizono2017-11-276-3/+69
* | | | Rename `TransactionTimeout` to more descriptive `LockWaitTimeout` (#31223)Ryuta Kamizono2017-11-276-9/+9
* | | | Merge pull request #31229 from y-yagi/remove_field_ids_from_scaffold_formKasper Timm Hansen2017-11-263-11/+7
|\ \ \ \
| * | | | Remove field ids from scaffold formyuuji.yaginuma2017-11-263-11/+7
* | | | | Revert "Merge pull request #31006 from rails/kamipo/ordinal_methods_should_re...eileencodes2017-11-262-17/+0
| |/ / / |/| | |
* | | | Revert "Remove stopgap_13632 entirely for now: it doesn't support 2.2.8"Matthew Draper2017-11-261-0/+3
* | | | Merge pull request #31221 from matthewd/flush-idle-connectionsMatthew Draper2017-11-266-17/+129
|\ \ \ \
| * | | | Flush idle database connectionsMatthew Draper2017-11-266-17/+129
* | | | | Merge pull request #31232 from weedySeaDragon/engines-guide-copyediting--neut...Matthew Draper2017-11-261-3/+3
|\ \ \ \ \
| * | | | | fix comma splice [ci skip]Ashley Engelund (weedySeaDragon @ github)2017-11-261-1/+1
| * | | | | verb tense correction [ci skip]Ashley Engelund (weedySeaDragon @ github)2017-11-261-1/+1
| * | | | | gendered wording not necessary; changed to neutral [ci skip]Ashley Engelund (weedySeaDragon @ github)2017-11-261-1/+1
|/ / / / /
* | / / / Let rubygems handle our objection to mysql2 0.4.3Matthew Draper2017-11-261-2/+1
| |/ / / |/| | |
* | | | Remove duplicated `form_with_generates_remote_forms` settingyuuji.yaginuma2017-11-261-1/+0
* | | | Merge pull request #31184 from TheSmartnik/fix_record_not_found_on_reloadRafael França2017-11-254-7/+35
|\ \ \ \