aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | write a test for `#form_data?`Sergey Alekseev2015-03-312-1/+29
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #18446 from cloud8421/actionmailer-unregister-interceptorSean Griffin2015-11-234-19/+137
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | ActionMailer::Base can unregister interceptor(s).Claudio Ortolina2015-01-314-19/+136
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #22372 from greysteil/clearer-ip-spoofing-commentRichard Schneeman2015-11-231-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Clearer comment and variable name on IP spoofingGrey Baker2015-11-221-7/+15
* | | | | | | | | | | | | | | | | | | | | | | | Remove blanket array delegation from `Relation`Sean Griffin2015-11-232-20/+2
| |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #22374 from DNNX/patch-1Rafael França2015-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Simplify `RailsGuides::Generator#select_only` a bitViktar Basharymau2015-11-221-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #22379 from yui-knk/translating_rails_guidesRafael França2015-11-231-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | [ci skip] Add `Translating Rails Guides` to contributing_to_ruby_on_railsyui-knk2015-11-231-0/+36
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #22380 from wjessop/fix_race_in_aj_integration_testsSean Griffin2015-11-233-7/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix race condition testing for job execution orderWill Jessop2015-11-233-7/+18
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Bring back `===` stubbing in `time_zone_select` test.Kasper Timm Hansen2015-11-221-1/+7
* | | | | | | | | | | | | | | | | | | | | | Ditch `each_with_index` for `each`.Kasper Timm Hansen2015-11-221-1/+1
* | | | | | | | | | | | | | | | | | | | | | Don't cache fake time zones.Kasper Timm Hansen2015-11-221-8/+9
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #21615 from ronakjangir47/actionViewpart2Kasper Timm Hansen2015-11-225-79/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Removed Mocha from Action ViewRonak Jangir2015-09-235-79/+133
* | | | | | | | | | | | | | | | | | | | | | removes the mutex around `changed`Xavier Noria2015-11-221-7/+2
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | reset the @updated flag before the callback invocationXavier Noria2015-11-211-2/+1
* | | | | | | | | | | | | | | | | | | | | make the @updated flag atomic in the evented monitorXavier Noria2015-11-211-5/+11
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22333 from harrykiselev/patch-3Yves Senn2015-11-211-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Update dirty.rb: documentation fix.Harry V. Kiselev2015-11-191-1/+5
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #22362 from radar/toggle-documentationClaudio B2015-11-201-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add example for AR::Persistence#toggleRyan Bigg2015-11-211-0/+8
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #22353 from Bounga/doc_for_cookies_encryptedClaudio B2015-11-201-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add missing example for cookies.encrypted [ci skip]Nicolas Cavigneaux2015-11-201-0/+7
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #22354 from nishantmodak/image-tag-data-attributesRafael França2015-11-202-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Example of setting data attributes for image_tagNishant Modak2015-11-202-1/+4
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #22355 from yui-knk/remove_arity_checkKasper Timm Hansen2015-11-202-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Remove arity check for `RouteSet#draw`yui-knk2015-11-212-10/+0
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #22332 from grosser/grosser/deprecationRafael França2015-11-206-4/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | add deprecations for a smooth transition after #22215Michael Grosser2015-11-196-4/+72
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #22347 from kamipo/fix_test_index_in_createSean Griffin2015-11-192-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix test failure in `adapters/mysql/active_schema_test.rb`Ryuta Kamizono2015-11-202-6/+6
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Revert "Allow specifying the default table options for mysql adapters"Sean Griffin2015-11-193-26/+1
* | | | | | | | | | | | | | | | | | | | | Allow specifying the default table options for mysql adaptersSean Griffin2015-11-193-1/+26
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22336 from tjschuck/enumerable_sum_perfKasper Timm Hansen2015-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Change Enumerable#sum to use inject(:sym) specificationT.J. Schuck2015-11-191-1/+1
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #22340 from rbr/change-configuration-exampleYves Senn2015-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Change configuration-guide examplerbr2015-11-191-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22342 from AlexVPopov/patch-1Abdelkader Boudih2015-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix a typoAlex Popov2015-11-191-1/+1
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22077 from obduk/clean-up-logsKasper Timm Hansen2015-11-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Remove newlines from start of logsOwen Davies2015-10-261-3/+3
* | | | | | | | | | | | | | | | | | | | | guides, scaffold no longer used in getting started guide. Closes #22337.Yves Senn2015-11-191-6/+24
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22338 from zacharywelch/patch-1Rafael França2015-11-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | [ci skip] Indentation in cache exampleszacharywelch2015-11-181-2/+2
|/ / / / / / / / / / / / / / / / / / / / /
* | / / / / / / / / / / / / / / / / / / / Add missing requireMatthew Draper2015-11-191-0/+2
| |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #22330 from samphilipd/samphilipd/rename_advisory_lock_keyRafael França2015-11-188-65/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Rename 'key' to 'lock_id' or 'lock_name' for advisory lockingSam Davies2015-11-188-65/+65