aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Delete bad testSean Griffin2016-06-071-5/+0
* Use `#performed?` to terminate controller callbacksJeff Kreeftmeijer2016-06-033-1/+23
* 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
|/ / /
* / / Fix failing testsSean Griffin2016-06-023-5/+17
|/ /
* | Merge pull request #25236 from rajatbansal93/fix-typoArun Agrawal2016-06-011-5/+5
|\ \
| * | fix typoRajat Bansal2016-06-011-5/+5
* | | Merge pull request #25231 from prathamesh-sonpatki/collapse-new-initializersDavid Heinemeier Hansson2016-06-0110-155/+59
|\ \ \
| * | | Collapse all new default initializers into a single filePrathamesh Sonpatki2016-05-3110-155/+59
* | | | Clean up the test request/response even after an exceptionMatthew Draper2016-06-012-23/+50
* | | | Make Active Record emit significantly smaller YAMLSean Griffin2016-05-318-7/+82
* | | | Remove unused require and unused model stubJon Moss2016-05-312-4/+0
* | | | Merge pull request #25170 from maclover7/add-configuration-cableJeremy Daer2016-05-318-51/+69
|\ \ \ \
| * | | | Add helper for testing against a mock WebSocket and serverJavan Makhmali2016-05-315-56/+48
| * | | | Reorganize `MockWebSocket`Jon Moss2016-05-312-22/+32
| * | | | Add configuration for `WebSocket` and `logger`Jon Moss2016-05-314-6/+22
* | | | | Respect options passed to `foreign_key` when reverting `add_reference`Sean Griffin2016-05-312-4/+24
* | | | | Merge pull request #25216 from javan/actioncable/tune-sauce-labs-testsJeremy Daer2016-05-313-21/+20
|\ \ \ \ \
| * | | | | Lock Faye version to avoid bug with its Promise polyfill, use mainline blade-...Javan Makhmali2016-05-312-15/+14
| * | | | | Test single latest browser versionJavan Makhmali2016-05-311-6/+6
| |/ / / /
* | | | | Merge pull request #25213 from kamipo/do_not_include_default_column_limitSean Griffin2016-05-313-10/+15
|\ \ \ \ \
| * | | | | Do not include default column limit in schema.rbRyuta Kamizono2016-05-313-10/+15
| |/ / / /
* | | | | `ActiveRecord::Base#hash` should differ between classesSean Griffin2016-05-312-1/+5
* | | | | More Action Pack `abstract_unit` cleanup (#25211)Jon Moss2016-05-314-28/+23