aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update url_helper.rb, adjust link_to api docAndreas Maierhofer2016-12-051-4/+3
* Merge pull request #27267 from prathamesh-sonpatki/fullstopKasper Timm Hansen2016-12-051-1/+1
|\
| * Add fullstop following the pattern used in rest of the filePrathamesh Sonpatki2016-12-051-1/+1
|/
* Merge pull request #27266 from simi/patch-1Guillermo Iguaran2016-12-041-1/+1
|\
| * Fix binstop -> binstub typo in railties changelog.Josef Šimánek2016-12-051-1/+1
|/
* Merge pull request #27258 from y-yagi/stop_using_removed_render_textKasper Timm Hansen2016-12-034-5/+5
|\
| * stop using removed `render :text`yuuji.yaginuma2016-12-034-5/+5
* | Merge pull request #27257 from koic/use_standard_name_javascriptXavier Noria2016-12-031-1/+1
|\ \
| * | Use JavaScripts instead of Javascripts in `rake stats`Koichi ITO2016-12-031-1/+1
|/ /
* | Remove unused argumentRafael Mendonça França2016-12-022-16/+5
* | Merge pull request #27250 from y-yagi/use_binstub_in_bin_updateGuillermo Iguaran2016-12-011-1/+1
|\ \ | |/ |/|
| * use yarn binstub in `bin/update`yuuji.yaginuma2016-12-021-1/+1
|/
* Exclude singleton classes from `subclasses` and `descendants`Sean Griffin2016-12-012-0/+11
* Stop using the `pg` Float encoderSean Griffin2016-12-011-1/+0
* Yarn: Move node_modules, package.json, and yarn.lock file to vendor (#27245)David Heinemeier Hansson2016-12-018-12/+16
* Merge pull request #27240 from nanaya/accidentally-headingMatthew Draper2016-12-011-2/+2
|\
| * Fix issue number from becoming markdown headernanaya2016-12-011-2/+2
|/
* Merge pull request #27233 from utilum/27202_remove_outdated_tip_in_form_helpe...Jon Moss2016-11-301-2/+0
|\
| * Fixes #27202, [ci skip]utilum2016-11-301-2/+0
|/
* Merge pull request #27206 from kirs/fix-testing-isolation-2Matthew Draper2016-12-011-7/+8
|\
| * Fix arguments passing in testing isolationKir Shatrov2016-11-301-7/+8
* | Make the second argument to `attribute` optionalSean Griffin2016-11-303-1/+15
* | Correct deprecation warnings in `ActiveRecord::Dirty`Sean Griffin2016-11-301-6/+6
* | Merge pull request #27225 from y-yagi/make_windows_check_more_accurateRafael França2016-11-306-7/+7
|\ \
| * | use `Gem.win_platform?` to check windows Ruby platformsyuuji.yaginuma2016-11-306-7/+7
* | | Prevent race condition when launching EventMachine reactorMatthew Draper2016-11-302-2/+28
|/ /
* | Avoid race condition in AJ integration testsMatthew Draper2016-11-302-1/+3
* | Merge pull request #27221 from phoet/current_is_not_usedMatthew Draper2016-11-301-1/+0
|\ \
| * | removed `@current` as it is not usedphoet2016-11-301-1/+0
* | | Merge pull request #27220 from mrreynolds/patch-1Kasper Timm Hansen2016-11-301-1/+1
|\ \ \ | |/ / |/| |
| * | fix typo in changelogRobert Glaser2016-11-301-1/+1
|/ /
* | Missing require 'active_support/notifications'Akira Matsuda2016-11-301-0/+1
* | Merge pull request #27217 from roryokane/patch-1Rafael França2016-11-291-1/+1
|\ \
| * | Fix typo in Rails 5.0 release notes – “when when”Rory O’Kane2016-11-291-1/+1
|/ /
* | Merge pull request #27212 from dcarral/docs-action-on-unpermitted-parameters ...Sean Griffin2016-11-291-2/+2
|\ \
| * | Document 'false' as option for 'action_on_unpermitted_parameters'Daniel Carral2016-11-291-2/+2
* | | Treat combined durations as a single unitSean Griffin2016-11-292-3/+20
|/ /
* | Merge pull request #27126 from kamipo/fix_unsigned_with_zerofillRafael França2016-11-294-2/+9
|\ \
| * | Fix that unsigned with zerofill is treated as signedRyuta Kamizono2016-11-274-2/+9
* | | Let's use only vendored rails-ujs while we start to publish it to npm registryGuillermo Iguaran2016-11-291-3/+1
* | | Add CHANGELOG entry for --yarn optionLiceth Ovalles2016-11-291-0/+5
* | | Merge pull request #26836 from Liceth/npmGuillermo Iguaran2016-11-298-3/+106
|\ \ \
| * | | Run yarn on setup and update scripts.Liceth Ovalles2016-11-282-2/+8
| * | | Add node_modules to default gitignoreLiceth Ovalles2016-11-281-0/+5
| * | | Add node_modules path to assets load paths when --yarn option is usedLiceth Ovalles2016-11-282-0/+5
| * | | Add package.json for Yarn if --yarn option is addedLiceth Ovalles2016-11-284-1/+88
* | | | rails-ujs is now shipped with Action ViewGuillermo Iguaran2016-11-296-17/+2
* | | | Merge pull request #27204 from JessRudder/22862-auth-note-on-testsJon Moss2016-11-281-0/+7
|\ \ \ \
| * | | | Add note about step needed to get tests to pass if you implemented basic auth...JessRudder2016-11-281-0/+7
|/ / / /
* | | | Merge pull request #27196 from kirs/rubocop-gemRafael França2016-11-282-0/+16
|\ \ \ \