aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix API controller tests by assigning them the encoding typePrathamesh Sonpatki2016-06-072-7/+7
* Merge pull request #25235 from prathamesh-sonpatki/cleanupSean Griffin2016-06-074-50/+32
|\
| * Use the `update` flag to provide more friendlier messages to people upgrading.Prathamesh Sonpatki2016-06-071-12/+9
| * Remove FORCE option as it was only needed for testsPrathamesh Sonpatki2016-06-072-2/+4
| * Update the documentation of new_framework_defaults file with more details abo...Prathamesh Sonpatki2016-06-041-13/+16
| * Fix minor regression about old apps not getting per_form_csrf and request_for...Prathamesh Sonpatki2016-06-044-25/+11
| * More cleanup of new framework defaultsPrathamesh Sonpatki2016-06-041-18/+12
* | Merge pull request #25265 from opti/improve/hash_compactKasper Timm Hansen2016-06-072-5/+16
|\ \
| * | Improve Hash#compact! documentation and testsIgor Pstyga2016-06-032-5/+16
* | | Merge pull request #25311 from jhass/openssl_verify_modeVipul A M2016-06-073-5/+4
|\ \ \
| * | | Do not suggest nonsensical OpenSSL verify modes [ci skip]Jonne Haß2016-06-073-5/+4
* | | | Merge pull request #25309 from maclover7/jm-bump-nokogiriSean Griffin2016-06-072-9/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Require Nokogiri >= 1.6.8Jon Moss2016-06-062-9/+13
* | | | Merge pull request #25294 from Zorbash/cache-fetch-race-condition-ttl-docVipul A M2016-06-061-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Change doc for race_condition_ttl option of ActiveSupport::Cache::Store#fetch...Dimitris Zorbas2016-06-061-2/+2
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 22:03:42 +0000