aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #32491 from yhirano55/enable_verbose_in_activestorageRyuta Kamizono2018-04-081-0/+1
|\
| * Enable verbose option in ActiveStorageYoshiyuki Hirano2018-04-081-0/+1
|/
* Merge pull request #32489 from yhirano55/update_railties_rdoc_mainXavier Noria2018-04-071-2/+2
|\
| * rewords a bit RDOC_MAIN.rdoc [ci skip]Yoshiyuki Hirano2018-04-081-2/+2
|/
* rewords a bit README.md [ci skip]Xavier Noria2018-04-071-4/+4
* Merge pull request #32487 from yhirano55/update_releasing_railsRyuta Kamizono2018-04-071-2/+2
|\
| * Update URLs in RELEASING_RAILS.md [ci skip]Yoshiyuki Hirano2018-04-071-2/+2
|/
* Merge pull request #32485 from bogdanvlviv/fix-actionview/CHANGELOG.mdRyuta Kamizono2018-04-071-2/+2
|\
| * Fix `actionview/CHANGELOG.md`bogdanvlviv2018-04-071-2/+2
|/
* Merge pull request #32482 from yhirano55/remove_record_tag_helperAndrew White2018-04-074-58/+4
|\
| * Remove RecordTagHelperYoshiyuki Hirano2018-04-074-58/+4
* | Merge pull request #32350 from rails/use-current-model-for-as-url-hostAndrew White2018-04-076-6/+26
|\ \
| * | Use a current model to provide the host for service urlsAndrew White2018-04-066-6/+26
* | | Partially revert 0bfdd1dyuuji.yaginuma2018-04-071-1/+5
* | | Upgrade capybara to 3.0.1 to make sure our tests are passingRafael Mendonça França2018-04-061-1/+3
|/ /
* | Protect all active storage controllers agains CSRFRafael Mendonça França2018-04-065-5/+11
* | Add Brewfile to make easier to install all dependencies we need to run testsRafael Mendonça França2018-04-061-0/+13
* | Merge pull request #32481 from yhirano55/add_securing_rails_app_guide_link_to...Rafael França2018-04-061-0/+3
|\ \
| * | [ci skip] Add securing rails app guide link to credential sectionYoshiyuki Hirano2018-04-071-0/+3
| |/
* | Merge pull request #32355 from kamipo/delegate_to_klass_in_a_scopeRafael França2018-04-065-1/+30
|\ \
| * | Deprecate accessibility of private/protected class methods in named scopeRyuta Kamizono2018-03-304-4/+16
| * | Bring back private class methods accessibility in named scopeRyuta Kamizono2018-03-274-2/+19
* | | Merge pull request #32472 from Edouard-chin/ec-activesupport-teardownRafael França2018-04-062-1/+42
|\ \ \
| * | | Rename the class as there is already an existing class with that nameEdouard CHIN2018-04-061-1/+1
| * | | `SetupAndTeardown#teardown` should call any subsequent after_teardown:Edouard CHIN2018-04-062-1/+42
* | | | Merge pull request #32479 from kylekeesling/ie11-activestorage-direct-upload-...Javan Makhmali2018-04-062-2/+2
|\ \ \ \
| * | | | fixes a bug in IE11 that broke direct uploadskylekeesling2018-04-062-2/+2
* | | | | Merge pull request #32480 from bogdanvlviv/add-changelog-about-dig-session-23864Rafael França2018-04-062-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add changelog entry for #32446bogdanvlviv2018-04-062-2/+6
* | | | | Fix structure:dump for multiple databaseseileencodes2018-04-061-2/+1
|/ / / /
* | | | Merge pull request #32477 from bogdanvlviv/fix-test-added-in-32444Eileen M. Uchitelle2018-04-061-2/+4
|\ \ \ \
| * | | | Fix test added in #32444bogdanvlviv2018-04-061-2/+4
| |/ / /
* | | / Fix broken `ServerTest` with Capybara 3.0.0yuuji.yaginuma2018-04-062-14/+10
| |_|/ |/| |
* | | Remove redundant type checkAndrew White2018-04-061-2/+1
|/ /
* | Merge pull request #32462 from yhirano55/add_ujs_desc_to_rakefile_in_actionviewRafael França2018-04-041-2/+3
|\ \
| * | Use comment instead of desc in actionview's RakefileYoshiyuki Hirano2018-04-051-2/+2
| * | Add :ujs desc to Rakefile in actionviewYoshiyuki Hirano2018-04-051-0/+1
|/ /
* | Merge pull request #32441 from composerinteralia/refute-notRafael França2018-04-0420-27/+223
|\ \
| * | Autocorrect `refute` RuboCop violationsDaniel Colson2018-04-0314-27/+27
| * | Add custom RuboCop for `assert_not` over `refute`Daniel Colson2018-04-036-0/+196
* | | Merge pull request #32444 from matrinox/fix-return-response-mutation-rack-loggerRafael Mendonça França2018-04-042-5/+21
|\ \ \
| * | | Stop mutating body responseGeoff Lee2018-04-032-5/+21
* | | | Merge pull request #32446 from sinsoku/add_dig_to_sessionRafael França2018-04-042-0/+20
|\ \ \ \
| * | | | Add #dig to ActionDispatch::Request::Sessionclaudiob2018-04-042-0/+20
| |/ / /
* | | | Merge pull request #32447 from utilum/splatRafael França2018-04-042-3/+4
|\ \ \ \
| * | | | passing splat keyword arguments as a single Hashutilum2018-04-042-3/+4
| |/ / /
* | | | Merge pull request #32457 from yhirano55/add_private_option_to_delegation_docRafael França2018-04-041-1/+2
|\ \ \ \
| * | | | [ci skip] Add :private option to delegation docYoshiyuki Hirano2018-04-051-1/+2
* | | | | Merge pull request #32414 from bogdan/query-cache-optimizationRafael França2018-04-042-12/+6
|\ \ \ \ \
| * | | | | Optimize the code inside AR::QueryCache middlewareBogdan Gusiev2018-04-042-12/+6