aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25309 from maclover7/jm-bump-nokogiriSean Griffin2016-06-072-9/+13
|\ | | | | Require Nokogiri >= 1.6.8
| * Require Nokogiri >= 1.6.8Jon Moss2016-06-062-9/+13
| | | | | | | | per security release today --> https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
* | 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::Sto… [ci skip]
| * Change doc for race_condition_ttl option of ↵Dimitris Zorbas2016-06-061-2/+2
| | | | | | | | | | | | | | | | | | ActiveSupport::Cache::Store#fetch [ci skip] The related option of this method, `expires_in` is documented as expecting an `ActiveSupport::Duration` value. To minimize any sort of ambiguity between duration options, this change also documents `race_condition_ttl` accepting `ActiveSupport::Duration`.
* | Merge pull request #25283 from javan/actioncable/blade-on-eventmachine1-2Jeremy Daer2016-06-062-12/+12
|\ \ | | | | | | Action Cable: Fix CI tests on Sauce Labs
| * | 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`
| * | | Add backticks to `ActiveRecord::Base.where`Jon Moss2016-06-041-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #25298 from alexcameron89/masterप्रथमेश Sonpatki2016-06-062-2/+2
|\ \ \ \ | |_|_|/ |/| | | [ci skip] Update redirecting links in guides
| * | | [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]
| * | | 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]
| * | | Added some useful configuration options into configuring.md [ci skip]Mehmet Emin İNAÇ2016-03-051-0/+26
| | | | | | | | | | | | | | | | | | | | Added information about inserting middlewares with indexes. I think this information useful. We can use indexes also for `insert_after` but the behavior is not same and this is not the right place to give full information about all configuration options. The configuration for I18n fallbacks is important for production environment. Especially using different fallbacks for different locales.
* | | | Merge pull request #25282 from prathamesh-sonpatki/trim-ac-readmeKasper Timm Hansen2016-06-041-156/+5
|\ \ \ \ | |_|_|/ |/| | | Trim Action Cable README [ci skip]
| * | | Added "Download and Installation" section to Action Cable README [ci skip]Prathamesh Sonpatki2016-06-041-0/+10
| | | | | | | | | | | | | | | | | | | | - Only Action Cable README did not have this section, all of the other READMEs have this section.
| * | | Trim Action Cable README [ci skip]Prathamesh Sonpatki2016-06-041-161/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Remove "Configuration", "Running the server", "Dependencies" and "Deployment" sections from the Action Cable README as they are already duplicated in the Action Cable overview guide.
* | | | Merge pull request #25278 from mechanicles/fix-linkJon Moss2016-06-041-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Fix link rubyonrails.org/core => http://rubyonrails.org/community
| * | | | [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.
| * | | | [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 failure
| * | | | Fix sqlite3 test failureRyuta Kamizono2016-06-042-3/+3
|/ / / / | | | | | | | | | | | | Sqlite3 test failure is due to 66ebbc4952f6cfb37d719f63036441ef98149418.
* | | / Dont re-define class SQLite3Adapter on testArthur Neves2016-06-032-108/+98
| |_|/ |/| | | | | | | | | | | | | | | | | We were declaring in a few tests, which depending of the order load will cause an error, as the super class could change. see https://github.com/rails/rails/commit/ac1c4e141b20c1067af2c2703db6e1b463b985da#commitcomment-17731383
* | | Merge pull request #25263 from abhishekjain16/doc_accessor_threadEileen M. Uchitelle2016-06-031-2/+2
|\ \ \ | | | | | | | | [skip ci] Fix grammar
| * | | [skip ci] Fix grammarAbhishek Jain2016-06-031-2/+2
| | | |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-0314-52/+40
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: guides/source/action_cable_overview.md
| * | | Grammar fixes for Contributing guideJon Moss2016-06-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why #25239, but it had good changes, so I'm manually pulling in the changes. [Jon Moss, Rajat Bansal] [ci skip]
| * | | `will be` --> `is`Jon Moss2016-05-311-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Light edits to Action Cable Overview guideJon Moss2016-05-281-3/+3
| | | | | | | | | | | | | | | | [ci skip]
| * | | `behaviour` --> `behavior`Jon Moss2016-05-272-2/+2
| | | | | | | | | | | | | | | | http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#english
| * | | - :scissors: space in code to match previous defaults.Vipul A M2016-05-231-3/+1
| | | | | | | | | | | | | | | | - Grammar edits.
| * | | Update i18n guide about how to change locale and translations paths [ci skip]Prathamesh Sonpatki2016-05-221-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | - config/application.rb no longer has comments about how to specify load paths or change default locale after https://github.com/rails/rails/commit/28dcadc0140dfdeb.
| * | | Small grammar fixes for Action Controller OverviewJon Moss2016-05-211-5/+6
| | | | | | | | | | | | | | | | [ci skip]
| * | | `routes.rb` --> `config/routes.rb`Jon Moss2016-05-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | For consistency. [ci skip]
| * | | Light grammar edits to beginning of Routing guideJon Moss2016-05-181-3/+3
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add tick marks + small grammar changeJon Moss2016-05-171-2/+2
| | | | | | | | | | | | | | | | [ci skip]
| * | | PerRequestDigestCacheExpiry middlware was been removed. Removed traces, for ↵Vipul A M2016-05-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same. https://github.com/rails/rails/commit/23b6a9c0fcb8992e18450d6fe0680bf09685b7db [ci skip]
| * | | Pass over API Apps guide grammar. [ci skip]Vipul A M2016-05-161-7/+5
| | | |
| * | | The `ActiveRecord::ConnectionAdapters::ConnectionManagement` and ↵Vipul A M2016-05-163-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::QueryCache` middlewares were removed with `Executor` addition on d3c9d808e3e242155a44fd2a89ef272cfade8fe8 Removes traces and reference of these from all places. [ci skip]
| * | | Change output genereated for middlewares on a new application. This has ↵Vipul A M2016-05-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | changed quite a bit after Executor middleware addition. [ci skip]
| * | | Add `ActiveRecord::Migration::CheckPending` to default middlewares for API AppsVipul A M2016-05-161-0/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #25243 from sukesan1984/add_i18n_validation_testYves Senn2016-06-031-4/+2
|\ \ \ \ | | | | | | | | | | Add i18n_validation_test
| * | | | Add i18n_validation_testsukesan19842016-06-021-4/+2
| | | | | | | | | | | | | | | | | | | | add active record uniqueness validation test for { on: [:create, :update] } condition.
* | | | | Merge pull request #25258 from alexcameron89/masterArthur Nogueira Neves2016-06-021-3/+3
|\ \ \ \ \ | | | | | | | | | | | | [skip ci] Make header bullets consistent in engines.md
| * | | | | [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 test
| * | | | | 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 channels
| * | | | | | Properly support reloading for Action Cable channelsMatthew Draper2016-06-0210-84/+56
| | |/ / / / | |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-20 23:26:48 +0000