Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #25281 from maclover7/jm-add-internal | Sean Griffin | 2016-06-07 | 3 | -1/+37 |
|\ | |||||
| * | Prevent `{ internal: true }` from being stored in the router | Jon Moss | 2016-06-07 | 3 | -1/+37 |
|/ | |||||
* | Merge pull request #25317 from prathamesh-sonpatki/fix-api-controller-tests | Kasper Timm Hansen | 2016-06-07 | 2 | -7/+7 |
|\ | |||||
| * | Fix API controller tests by assigning them the encoding type | Prathamesh Sonpatki | 2016-06-07 | 2 | -7/+7 |
* | | Merge pull request #25247 from y-yagi/reference_actual_class | Kasper Timm Hansen | 2016-06-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | reference actual class to use middleware | yuuji.yaginuma | 2016-06-02 | 1 | -1/+1 |
* | | | Add regression test to `as` option. | Kasper Timm Hansen | 2016-06-07 | 1 | -0/+16 |
* | | | Merge pull request #25079 from jeffkreeftmeijer/send_file-halts-request-cycle | Sean Griffin | 2016-06-07 | 4 | -6/+23 |
|\ \ \ | |||||
| * | | | Delete bad test | Sean Griffin | 2016-06-07 | 1 | -5/+0 |
| * | | | Use `#performed?` to terminate controller callbacks | Jeff Kreeftmeijer | 2016-06-03 | 3 | -1/+23 |
* | | | | Flag `to_time` + simplify version names. | Kasper Timm Hansen | 2016-06-07 | 1 | -5/+6 |
| |_|/ |/| | | |||||
* | | | Merge pull request #25235 from prathamesh-sonpatki/cleanup | Sean Griffin | 2016-06-07 | 4 | -50/+32 |
|\ \ \ | |||||
| * | | | Use the `update` flag to provide more friendlier messages to people upgrading. | Prathamesh Sonpatki | 2016-06-07 | 1 | -12/+9 |
| * | | | Remove FORCE option as it was only needed for tests | Prathamesh Sonpatki | 2016-06-07 | 2 | -2/+4 |
| * | | | Update the documentation of new_framework_defaults file with more details abo... | Prathamesh Sonpatki | 2016-06-04 | 1 | -13/+16 |
| * | | | Fix minor regression about old apps not getting per_form_csrf and request_for... | Prathamesh Sonpatki | 2016-06-04 | 4 | -25/+11 |
| * | | | More cleanup of new framework defaults | Prathamesh Sonpatki | 2016-06-04 | 1 | -18/+12 |
* | | | | Merge pull request #25265 from opti/improve/hash_compact | Kasper Timm Hansen | 2016-06-07 | 2 | -5/+16 |
|\ \ \ \ | |||||
| * | | | | Improve Hash#compact! documentation and tests | Igor Pstyga | 2016-06-03 | 2 | -5/+16 |
* | | | | | Merge pull request #25311 from jhass/openssl_verify_mode | Vipul A M | 2016-06-07 | 3 | -5/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Do not suggest nonsensical OpenSSL verify modes [ci skip] | Jonne Haß | 2016-06-07 | 3 | -5/+4 |
* | | | | | | Merge pull request #25309 from maclover7/jm-bump-nokogiri | Sean Griffin | 2016-06-07 | 2 | -9/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Require Nokogiri >= 1.6.8 | Jon Moss | 2016-06-06 | 2 | -9/+13 |
* | | | | | | Merge pull request #25294 from Zorbash/cache-fetch-race-condition-ttl-doc | Vipul A M | 2016-06-06 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Change doc for race_condition_ttl option of ActiveSupport::Cache::Store#fetch... | Dimitris Zorbas | 2016-06-06 | 1 | -2/+2 |
* | | | | | | Merge pull request #25283 from javan/actioncable/blade-on-eventmachine1-2 | Jeremy Daer | 2016-06-06 | 2 | -12/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update Blade and its Sauce Labs plugin for EventMachine 1.2 compatibility | Javan Makhmali | 2016-06-04 | 2 | -12/+12 |
* | | | | | | | Merge pull request #25279 from maclover7/jm-add-backticks-1 | David Heinemeier Hansson | 2016-06-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add backticks to `ActiveRecord::Base.where` | Jon Moss | 2016-06-04 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #25298 from alexcameron89/master | प्रथमेश Sonpatki | 2016-06-06 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | [ci skip] Update redirecting links in guides | Alex Kitchens | 2016-06-06 | 2 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #25292 from jwworth/fix_time_field_typo_1465154852 | Vipul A M | 2016-06-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix a typo in `time_field` [ci skip] | Jake Worth | 2016-06-05 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #24071 from meinac/configuring_md_docs | Vipul A M | 2016-06-05 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Added some useful configuration options into configuring.md [ci skip] | Mehmet Emin İNAÇ | 2016-03-05 | 1 | -0/+26 |
* | | | | | | | | Merge pull request #25282 from prathamesh-sonpatki/trim-ac-readme | Kasper Timm Hansen | 2016-06-04 | 1 | -156/+5 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Added "Download and Installation" section to Action Cable README [ci skip] | Prathamesh Sonpatki | 2016-06-04 | 1 | -0/+10 |
| * | | | | | | | Trim Action Cable README [ci skip] | Prathamesh Sonpatki | 2016-06-04 | 1 | -161/+0 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #25278 from mechanicles/fix-link | Jon Moss | 2016-06-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ci skip] Fix link rubyonrails.org/core => http://rubyonrails.org/community. | Santosh Wadghule | 2016-06-04 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #25277 from mechanicles/remove-pratik-from-core | Jon Moss | 2016-06-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | [ci skip] Remove Pratik Naik from Rails core team info. | Santosh Wadghule | 2016-06-04 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #25272 from kamipo/fix_sqlite3_test_failure | Eileen M. Uchitelle | 2016-06-04 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix sqlite3 test failure | Ryuta Kamizono | 2016-06-04 | 2 | -3/+3 |
|/ / / / / / / | |||||
* | | / / / / | Dont re-define class SQLite3Adapter on test | Arthur Neves | 2016-06-03 | 2 | -108/+98 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #25263 from abhishekjain16/doc_accessor_thread | Eileen M. Uchitelle | 2016-06-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | [skip ci] Fix grammar | Abhishek Jain | 2016-06-03 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-06-03 | 14 | -52/+40 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Grammar fixes for Contributing guide | Jon Moss | 2016-06-02 | 1 | -7/+7 |
| * | | | | `will be` --> `is` | Jon Moss | 2016-05-31 | 1 | -1/+1 |