aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix typo in the `touch_all` doc [ci skip]Ryuta Kamizono2018-04-211-4/+4
* Merge pull request #32674 from composerinteralia/relax-assertionRyuta Kamizono2018-04-211-2/+2
|\
| * Relax assertions in connection config testsDaniel Colson2018-04-201-2/+2
* | Merge pull request #32655 from robotdana/preload-through-polymorphic-associat...Rafael Mendonça França2018-04-204-10/+51
|\ \
| * | Can preload associations through polymorphic associationsDana Sherson2018-04-204-10/+51
|/ /
* | Merge pull request #31513 from fatkodima/relation-touch_allRafael França2018-04-204-11/+101
|\ \
| * | Add `touch_all` method to `ActiveRecord::Relation`fatkodima2018-04-134-11/+101
* | | Merge pull request #29286 from vinistock/create_missing_exact_template_exceptionRafael Mendonça França2018-04-208-20/+44
|\ \ \
| * | | Create MissingExactTemplate exception with separate templateVinicius Stock2018-04-207-20/+37
* | | | Merge pull request #32572 from nao0515ki/add_optional_true_to_self_joins_sectionRafael França2018-04-201-1/+1
|\ \ \ \
| * | | | [ci skip] belongs_to in self join association needs optional: true, if it's o...nao0515ki2018-04-141-1/+1
* | | | | Don't include bootsnap by default in apps generated under JRubyGuillermo Iguaran2018-04-202-4/+13
* | | | | Merge pull request #32403 from albertoalmagro/improve-source-annotation-commentsRafael França2018-04-201-6/+6
|\ \ \ \ \
| * | | | | [ci skip] Prefix class name with Rails:: in docsAlberto Almagro2018-04-201-3/+3
| * | | | | [ci skip] Improve #find_in documentation.Alberto Almagro2018-04-201-3/+3
* | | | | | Merge pull request #32667 from yahonda/mod_empty_insert_statement_valueRafael França2018-04-203-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow `primary_key` argument to `empty_insert_statement_value`Yasuo Honda2018-04-203-3/+3
* | | | | | Merge pull request #32665 from albertoalmagro/fix-typos-filter-parametersRafael França2018-04-202-3/+3
|\ \ \ \ \ \
| * | | | | | Fix typo on method nameAlberto Almagro2018-04-201-1/+1
| * | | | | | [ci skip] Fix doc typos ActionDispatch::Http::FilterParametersAlberto Almagro2018-04-201-2/+2
* | | | | | | Merge pull request #23868 from gsamokovarov/debug-exceptions-interceptorsRafael França2018-04-203-1/+59
|\ \ \ \ \ \ \
| * | | | | | | Introduce ActionDispatch::DebugExceptions interceptorsGenadi Samokovarov2018-04-203-1/+59
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #32659 from utilum/ambiguous_first_argumentAndrew White2018-04-201-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | warning: ambiguous first argument; put parentheses or a space even after `/' ...utilum2018-04-201-1/+1
|/ / / / / /
* | | | | | Merge pull request #32642 from bogdanvlviv/fix-name-test-added-by-32613Andrew White2018-04-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix name of the test added by #32613bogdanvlviv2018-04-191-1/+1
* | | | | | Make JS views rendered work with content security policyyuuji.yaginuma2018-04-202-1/+8
* | | | | | Merge pull request #32575 from ybakos/guides/testing/pluralize_class_namesRafael França2018-04-191-3/+3
|\ \ \ \ \ \
| * | | | | | guides/testing: Pluralize controller and helper class names.Yong Bakos2018-04-141-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #32650 from bogdanvlviv/return_back_slash_and_use___dir__Rafael França2018-04-192-2/+2
|\ \ \ \ \ \
| * | | | | | Return back "/" to the end of RAILS_GEM_ROOTbogdanvlviv2018-04-202-2/+2
* | | | | | | Merge pull request #32574 from DmytroVasin/rails-ujs-stoppable-eventsRafael França2018-04-199-64/+73
|\ \ \ \ \ \ \
| * | | | | | | Fix stoppable events in tests and docs.Dmytro Vasin2018-04-149-64/+73
| | |/ / / / / | |/| | | | |
* | | | | | | Revert "Merge pull request #32652 from bogdanvlviv/add-missing-changelog-for-...Rafael Mendonça França2018-04-191-12/+0
* | | | | | | Merge pull request #32649 from rails/universal-ruby-versionGuillermo Iguaran2018-04-192-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Create a .ruby-version compatible with MRI/JRuby by defaultGuillermo Iguaran2018-04-192-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Don't expose `Relation#preload_associations` in the docRyuta Kamizono2018-04-201-1/+1
* | | | | | | Merge pull request #32654 from yahonda/suppress_ambiguous_first_argument_at_d...Ryuta Kamizono2018-04-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use assert_no_match for test_order_to_unscope_reorderingYasuo Honda2018-04-201-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #32652 from bogdanvlviv/add-missing-changelog-for-32593Ryuta Kamizono2018-04-201-0/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add missing changelog entrybogdanvlviv2018-04-201-0/+12
| |/ / / / /
* | | | | | Merge pull request #32645 from maneframe/skip_query_cache_mergeRafael Mendonça França2018-04-192-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix relation merging with skip_query_cache!James Williams2018-04-193-3/+11
* | | | | | Merge pull request #32648 from bogdanvlviv/improve-pattern-filenames-to-catch...Rafael França2018-04-196-13/+13
|\ \ \ \ \ \
| * | | | | | Allow rubocop check more filesbogdanvlviv2018-04-196-13/+13
* | | | | | | Merge pull request #32168 from christianblais/activesupport-ordinalize-i18nRafael França2018-04-194-13/+59
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | `ActiveSupport::Inflector#ordinal` and `ActiveSupport::Inflector#ordinalize`Christian Blais2018-03-054-13/+59
* | | | | | | Merge pull request #32401 from yhirano55/improve_css_in_guideRafael França2018-04-192-12/+2
|\ \ \ \ \ \ \
| * | | | | | | Improve css in guideYoshiyuki Hirano2018-04-012-12/+2
* | | | | | | | Merge pull request #32636 from yhirano55/improve_line_tasksRafael França2018-04-192-2/+2
|\ \ \ \ \ \ \ \