aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Fix indentation in ActionMailer::Base#collect_responses_from_templateshnatt2015-10-291-5/+5
| * | | | | | | | | | | Refactor out headers to message assignment from ActionMailer::Base#mailhnatt2015-10-291-3/+6
| * | | | | | | | | | | Use attr_internal in ActionMailer::Base#mail instead of local var for messagehnatt2015-10-291-11/+9
| * | | | | | | | | | | Refactor out defaults handling from ActionMailer::Base#mailhnatt2015-10-291-9/+15
| * | | | | | | | | | | Refactor ActionMailer::Base#collect_responseshnatt2015-10-291-16/+16
| * | | | | | | | | | | Reduce code duplication in ActionMailer::Base#register_observer and #register...hnatt2015-10-291-16/+12
* | | | | | | | | | | | Merge pull request #22287 from dharamgollapudi/patch-2Rafael França2015-11-241-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move the desc one level up Dharam Gollapudi2015-11-131-2/+1
* | | | | | | | | | | | | Merge pull request #22390 from jacobbednarz/update-valgrind-docs-for-macosx-s...Rafael França2015-11-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove valgrind note about linux only supportJacob Bednarz2015-11-241-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #22272 from y-yagi/remove_test_files_in_plugin_gemspecEileen M. Uchitelle2015-11-231-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | don't package test files in plugin gemspecyuuji.yaginuma2015-11-121-3/+0
* | | | | | | | | | | | | | Merge pull request #22388 from kamipo/set_field_encoding_is_only_needed_for_m...Sean Griffin2015-11-233-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | `set_field_encoding` is only needed for `MysqlAdapter`Ryuta Kamizono2015-11-243-9/+8
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Fix more test failures caused by #21000Sean Griffin2015-11-231-1/+5
* | | | | | | | | | | | | | Fix test failures caused by #21000Sean Griffin2015-11-231-0/+1
* | | | | | | | | | | | | | Revert "Merge pull request #18446 from cloud8421/actionmailer-unregister-inte...Sean Griffin2015-11-234-137/+19
* | | | | | | | | | | | | | Merge pull request #21000 from twalpole/find_or_parameter_issuesSean Griffin2015-11-237-44/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update and fix forbidden attributes testsThomas Walpole2015-11-037-44/+101
* | | | | | | | | | | | | | | Merge pull request #22385 from headius/each_object_singleton_testSean Griffin2015-11-231-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Test if each_object(singleton_class) works, since JRuby added it.Charles Oliver Nutter2015-11-231-2/+3
* | | | | | | | | | | | | | | | Merge pull request #17013 from gsamokovarov/fix-null-resolverSean Griffin2015-11-231-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix improper value types used to instantiate a Template in AV::NullResolverGenadi Samokovarov2014-09-221-2/+1
* | | | | | | | | | | | | | | | | Merge pull request #17928 from sergey-alekseev/remove-unused-form-data-methodSean Griffin2015-11-232-3/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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