aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve redundancy in line tasksYoshiyuki Hirano2018-04-192-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | [ci skip] Restore of links in RDOC_MAIN after an update of the file (#32644)Felipe Tovar2018-04-191-11/+11
* | | | | | | | | | Merge pull request #32593 from sdhull/fix-strong-params-permit-bangRafael Mendonça França2018-04-192-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixes StrongParameters permit! to work with nested arraysSteve Hull2018-04-163-2/+12
* | | | | | | | | | | Merge pull request #32605 from composerinteralia/assert-notRafael França2018-04-19104-338/+429
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Replace `assert !` with `assert_not`Daniel Colson2018-04-1998-328/+328
| * | | | | | | | | | | Add RuboCop for `assert_not` over `assert !`Daniel Colson2018-04-196-10/+101
* | | | | | | | | | | | Merge pull request #32637 from yhirano55/add_exclude_condition_in_rubocopRafael França2018-04-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add exculude condition in rubocop.ymlYoshiyuki Hirano2018-04-201-0/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #32638 from yhirano55/navigate_edgeguide_from_github_templateRafael França2018-04-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Navigate edgeguide from .github template [ci skip]Yoshiyuki Hirano2018-04-202-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | [ci skip] Remove style of the word Rails at the topGuillermo Iguaran2018-04-191-1/+1
* | | | | | | | | | | Merge pull request #32626 from ftovaro/masterXavier Noria2018-04-192-40/+54
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] Remove style of the word Rails at the topFelipe Tovar2018-04-191-1/+1
| * | | | | | | | | | | [ci skip] Missing \ in RDOC_MAINFelipe Tovar2018-04-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ci skip] update RDOC_MAINFelipe Tovar2018-04-191-23/+30
| * | | | | | | | | | | | [ci skip] update RDOC_MAINFelipe Tovar2018-04-191-23/+30
| |/ / / / / / / / / / /
| * | | | | | | | | | | Update READMEFelipe Tovar2018-04-181-18/+25
* | | | | | | | | | | | Merge pull request #32635 from yhirano55/update_cocGuillermo Iguaran2018-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update CoC to change a history of updates URL [ci skip]Yoshiyuki Hirano2018-04-191-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #32625 from stephendolan/masterKasper Timm Hansen2018-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] Fix minor system testing documentation typo.Stephen2018-04-181-1/+1
* | | | | | | | | | | | Merge pull request #32627 from jlduran/make-master-key-readable-only-by-ownerAndrew White2018-04-193-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \