aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added missing test for presence of CSP initializerPrathamesh Sonpatki2017-11-271-0/+1
* 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
|\ \
| * | Provide arguments to RecordNotFoundNikita Misharin2017-11-254-7/+35
* | | Merge pull request #31181 from tenshilg/fix-api-guidesRafael França2017-11-251-2/+4
|\ \ \
| * | | Fix names of http authentication modules in api_app guidesRoman Kovtunenko2017-11-191-2/+4
* | | | Renove duplicated and wrong testRafael Mendonça França2017-11-251-5/+0
* | | | Add test to make sure form_for is not affected byRafael Mendonça França2017-11-251-0/+32
* | | | Make sure that form_with_generates_ids only affects form_withRafael Mendonça França2017-11-255-3/+9
* | | | Use parentheses for multi-line method callsRafael Mendonça França2017-11-252-5/+10
* | | | Merge pull request #29439 from npezza93/set-skip-default-idsRafael Mendonça França2017-11-2512-228/+316
|\ \ \ \
| * | | | Make form_with_generates_ids default in Rails 5.2Rafael Mendonça França2017-11-252-5/+8
| * | | | Change `form_with` to generates ids by defaultnpezza932017-11-2512-225/+310
* | | | | Merge pull request #30879 from toptal/add_better_logging_to_delayed_jobRafael França2017-11-252-0/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve DelayedJob wrapper loggingJacek Lachowski2017-11-242-0/+11
* | | | | Compare the actual string after comparing the HMAC proccessed stringsRafael Mendonça França2017-11-251-1/+1
* | | | | Merge pull request #24510 from vipulnsward/make-variable_size_secure_compare-...Rafael Mendonça França2017-11-255-19/+37
|\ \ \ \ \
| * | | | | Changed default behaviour of `ActiveSupport::SecurityUtils.secure_compare`,Vipul A M2017-06-075-19/+37
* | | | | | Merge pull request #30510 from yhirano55/add_nodoc_to_activerecordEileen M. Uchitelle2017-11-253-7/+7
|\ \ \ \ \ \
| * | | | | | Add :nodoc: to activerecord [ci skip]Yoshiyuki Hirano2017-09-033-7/+7
* | | | | | | Merge pull request #31006 from rails/kamipo/ordinal_methods_should_respect_lo...Eileen M. Uchitelle2017-11-252-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Ordinal methods should respect loaded recordsRyuta Kamizono2017-10-282-0/+17
* | | | | | | | Merge pull request #31226 from fgo/patch-22Eileen M. Uchitelle2017-11-251-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Update guide layout [ci skip]Francis Go2017-11-251-3/+3
|/ / / / / / / /
* | | | | | | | [ci skip] SecureRandom should mentioned Win32 CryptoAPI functions ins… (#31...Atul Shimpi2017-11-251-1/+1
* | | | | | | | Merge pull request #31173 from matthewd/connection-fork-safetyMatthew Draper2017-11-255-0/+90
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Improve AR connection fork safetyMatthew Draper2017-11-185-0/+90
* | | | | | | | Merge pull request #31215 from dixitp012/fix_rubocop_style_in_railtiesRafael França2017-11-241-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Rubocop styleDixit Patel2017-11-241-0/+2