aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25283 from javan/actioncable/blade-on-eventmachine1-2Jeremy Daer2016-06-062-12/+12
|\
| * Update Blade and its Sauce Labs plugin for EventMachine 1.2 compatibilityJavan Makhmali2016-06-042-12/+12
* | Merge pull request #25279 from maclover7/jm-add-backticks-1David Heinemeier Hansson2016-06-061-1/+1
|\ \
| * | Add backticks to `ActiveRecord::Base.where`Jon Moss2016-06-041-1/+1
* | | Merge pull request #25298 from alexcameron89/masterप्रथमेश Sonpatki2016-06-062-2/+2
|\ \ \
| * | | [ci skip] Update redirecting links in guidesAlex Kitchens2016-06-062-2/+2
|/ / /
* | | Merge pull request #25292 from jwworth/fix_time_field_typo_1465154852Vipul A M2016-06-051-1/+1
|\ \ \
| * | | Fix a typo in `time_field` [ci skip]Jake Worth2016-06-051-1/+1
* | | | Merge pull request #24071 from meinac/configuring_md_docsVipul A M2016-06-051-0/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Added some useful configuration options into configuring.md [ci skip]Mehmet Emin İNAÇ2016-03-051-0/+26
* | | | Merge pull request #25282 from prathamesh-sonpatki/trim-ac-readmeKasper Timm Hansen2016-06-041-156/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added "Download and Installation" section to Action Cable README [ci skip]Prathamesh Sonpatki2016-06-041-0/+10
| * | | Trim Action Cable README [ci skip]Prathamesh Sonpatki2016-06-041-161/+0
* | | | Merge pull request #25278 from mechanicles/fix-linkJon Moss2016-06-041-1/+1
|\ \ \ \
| * | | | [ci skip] Fix link rubyonrails.org/core => http://rubyonrails.org/community.Santosh Wadghule2016-06-041-1/+1
* | | | | Merge pull request #25277 from mechanicles/remove-pratik-from-coreJon Moss2016-06-041-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ci skip] Remove Pratik Naik from Rails core team info.Santosh Wadghule2016-06-041-1/+1
| |/ / /
* | | | Merge pull request #25272 from kamipo/fix_sqlite3_test_failureEileen M. Uchitelle2016-06-042-3/+3
|\ \ \ \
| * | | | Fix sqlite3 test failureRyuta Kamizono2016-06-042-3/+3
|/ / / /
* | | / Dont re-define class SQLite3Adapter on testArthur Neves2016-06-032-108/+98
| |_|/ |/| |
* | | Merge pull request #25263 from abhishekjain16/doc_accessor_threadEileen M. Uchitelle2016-06-031-2/+2
|\ \ \
| * | | [skip ci] Fix grammarAbhishek Jain2016-06-031-2/+2
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-0314-52/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Grammar fixes for Contributing guideJon Moss2016-06-021-7/+7
| * | | `will be` --> `is`Jon Moss2016-05-311-1/+1
| * | | Light edits to Action Cable Overview guideJon Moss2016-05-281-3/+3
| * | | `behaviour` --> `behavior`Jon Moss2016-05-272-2/+2
| * | | - :scissors: space in code to match previous defaults.Vipul A M2016-05-231-3/+1
| * | | Update i18n guide about how to change locale and translations paths [ci skip]Prathamesh Sonpatki2016-05-221-4/+5
| * | | Small grammar fixes for Action Controller OverviewJon Moss2016-05-211-5/+6
| * | | `routes.rb` --> `config/routes.rb`Jon Moss2016-05-191-4/+4
| * | | Light grammar edits to beginning of Routing guideJon Moss2016-05-181-3/+3
| * | | Add tick marks + small grammar changeJon Moss2016-05-171-2/+2
| * | | PerRequestDigestCacheExpiry middlware was been removed. Removed traces, for t...Vipul A M2016-05-171-1/+0
| * | | Pass over API Apps guide grammar. [ci skip]Vipul A M2016-05-161-7/+5
| * | | The `ActiveRecord::ConnectionAdapters::ConnectionManagement` and `ActiveRecor...Vipul A M2016-05-163-13/+3
| * | | Change output genereated for middlewares on a new application. This has chang...Vipul A M2016-05-161-3/+3
| * | | Add `ActiveRecord::Migration::CheckPending` to default middlewares for API AppsVipul A M2016-05-161-0/+1
* | | | Merge pull request #25243 from sukesan1984/add_i18n_validation_testYves Senn2016-06-031-4/+2
|\ \ \ \
| * | | | Add i18n_validation_testsukesan19842016-06-021-4/+2
* | | | | Merge pull request #25258 from alexcameron89/masterArthur Nogueira Neves2016-06-021-3/+3
|\ \ \ \ \
| * | | | | [skip ci] Make header bullets consistent in engines.mdAlex Kitchens2016-06-021-3/+3
|/ / / / /
* | | | | Merge pull request #25254 from kamipo/fix_debug_helper_testSean Griffin2016-06-021-1/+4
|\ \ \ \ \
| * | | | | Fix debug helper testRyuta Kamizono2016-06-031-1/+4
* | | | | | Merge pull request #25240 from matthewd/reloadable-channelsMatthew Draper2016-06-0310-84/+56
|\ \ \ \ \ \
| * | | | | | Properly support reloading for Action Cable channelsMatthew Draper2016-06-0210-84/+56
| | |/ / / / | |/| | | |
* | | | | | Don't blank pad day of the month when formatting datesSean Griffin2016-06-023-3/+21
* | | | | | Ensure that records with unselected fields can be updatedSean Griffin2016-06-022-0/+17
| |/ / / / |/| | | |
* | | | | Merge pull request #25252 from felguerez/masterVipul A M2016-06-021-1/+1
|\ \ \ \ \
| * | | | | add missing "as"Antonio Felguerez2016-06-021-1/+1
|/ / / / /