aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-05-17174-874/+1495
|\
| * Merge pull request #29063 from sepehr500/masterRafael França2017-05-172-2/+12
| |\
| | * Fixed string being modified in place causing frozen string errors in Ruby 2.3sepehr5002017-05-152-2/+12
| * | Merge pull request #29118 from kamipo/remove_respond_to_reset_scopeRafael França2017-05-171-1/+1
| |\ \
| | * | Remove unneeded `association.respond_to?(:reset_scope)`Ryuta Kamizono2017-05-171-1/+1
| * | | Merge pull request #29122 from koic/ci_against_jruby_9_1_9_0Rafael França2017-05-171-3/+3
| |\ \ \
| | * | | CI against JRuby 9.1.9.0Koichi ITO2017-05-171-3/+3
| |/ / /
| * | | Merge pull request #29117 from yahonda/another_29021Rafael Mendonça França2017-05-161-23/+23
| |\ \ \
| | * | | Set non 0 value to logger not to be affected by Ruby versionsYasuo Honda2017-05-171-23/+23
| | |/ /
| * | | Merge pull request #29089 from yahonda/address_29021Rafael França2017-05-161-9/+9
| |\ \ \ | | |/ / | |/| |
| | * | Address LogSubscriberTest failures to support Rails 2.5.0-devYasuo Honda2017-05-161-9/+9
| | |/
| * | Fix association documentationRafael Mendonça França2017-05-161-6/+5
| * | Merge pull request #29056 from juliusdelta/29055-missing-links-in-activesuppo...Andrew White2017-05-161-1/+1
| |\ \ | | |/ | |/|
| | * Old expression caught to many chars resulting in 404. Added minor change to r...JD Gonzales2017-05-121-1/+1
| * | Merge pull request #29095 from y-yagi/fix_test_with_rack_203Guillermo Iguaran2017-05-152-7/+7
| |\ \
| | * | Fix `TestInvalidUrls` with rack 2.0.3yuuji.yaginuma2017-05-161-6/+6
| | * | Bump rack versionyuuji.yaginuma2017-05-161-1/+1
| * | | Merge pull request #29077 from rails/ignore-tables-in-sql-dumpGuillermo Iguaran2017-05-158-5/+85
| |\ \ \ | | |/ / | |/| |
| | * | Changelog entry [ci-skip]Guillermo Iguaran2017-05-151-0/+4
| | * | Improvements for SQLite rake task.Guillermo Iguaran2017-05-151-7/+18
| | * | Update SchemaDumper.ignore_tables docsGuillermo Iguaran2017-05-151-2/+2
| | * | Respect 'ignore_tables' in SQLite structure dumpGuillermo Iguaran2017-05-152-1/+30
| | * | Respect 'ignore_tables' in MySQL structure dumpGuillermo Iguaran2017-05-152-0/+22
| | * | Respect `ignore_tables` in Postgres structure dumpRusty Geldmacher2017-05-152-0/+14
| |/ /
| * | Merge pull request #29086 from mikeycgto/message-encryptor-auth-tag-checkKasper Timm Hansen2017-05-152-8/+20
| |\ \
| | * | Updates to MessageEncryptor AEAD testsMichael Coyne2017-05-151-10/+14
| | * | Fix for AEAD auth_tag check in MessageEncryptorMichael Coyne2017-05-152-1/+9
| * | | Merge pull request #29083 from eugeneius/local_cache_unless_existEileen M. Uchitelle2017-05-152-1/+14
| |\ \ \
| | * | | Don't cache locally if unless_exist was passedEugene Kenny2017-05-142-1/+14
| |/ / /
| * | | explain why guide translations need a fork [ci skip]Xavier Noria2017-05-141-3/+4
| * | | Clarify documentation for system test argumentseileencodes2017-05-141-2/+2
| * | | Use a more realistic use-case for system test generatoreileencodes2017-05-141-5/+5
| * | | Update system test runner docseileencodes2017-05-142-8/+10
| * | | Merge pull request #29010 from y-yagi/fix_28988Guillermo Iguaran2017-05-133-6/+32
| |\ \ \ | | |_|/ | |/| |
| | * | Allow irb options to be passed from `rails console` commandyuuji.yaginuma2017-05-083-6/+32
| * | | Merge pull request #29064 from boykoc/revenge-of-the-fixturesEileen M. Uchitelle2017-05-121-1/+1
| |\ \ \
| | * | | [ci skip] Mailer fixtures in Testing guide.Cody Boyko2017-05-121-1/+1
| |/ / /
| * | | Merge pull request #29062 from eileencodes/force-encoding-to-original-string-...Eileen M. Uchitelle2017-05-122-0/+7
| |\ \ \
| | * | | Maintain original encoding from patheileencodes2017-05-122-0/+7
| * | | | Merge pull request #28919 from meinac/fix_ambigious_exception_message_of_sele...Kasper Timm Hansen2017-05-121-1/+1
| |\ \ \ \
| | * | | | Fix ambigious error message of select query methodMehmet Emin INAC2017-05-081-1/+1
| * | | | | Merge pull request #29029 from timolehto/masterRafael França2017-05-111-1/+1
| |\ \ \ \ \
| | * | | | | rake -T should load development env by default, not testTimo Kilpilehto2017-05-101-1/+1
| * | | | | | Merge pull request #29034 from peterjm/handle_loops_in_exception_handlingRafael França2017-05-112-3/+41
| |\ \ \ \ \ \
| | * | | | | | handle loops in the cause chain in Rescuable#rescue_with_handlerPeter McCracken2017-05-102-3/+41
| * | | | | | | Merge pull request #29040 from eugeneius/parameters_delete_blockAaron Patterson2017-05-112-2/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Pass block in ActionController::Parameters#deleteEugene Kenny2017-05-102-2/+23
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #29043 from kamipo/dont_eager_loading_if_unneeded_for_existsAaron Patterson2017-05-113-4/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Don't eager loading if unneeded for `FinderMethods#exists?`Ryuta Kamizono2017-05-113-4/+6
| | |/ / / / / /
| * | | | | | | Defer loading each DB Tasks class from AR DatabaseTasksAkira Matsuda2017-05-111-6/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 09:43:38 +0000