aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Include the content of the flash in the auto-generated etag (#26250)David Heinemeier Hansson2016-08-225-0/+59
* Merge pull request #26249 from rafamanzo/add_redis_to_development_dependenciesRafael França2016-08-221-0/+43
|\
| * [ci skip] Update docs with Action Cable Redis dependencyRafael Reggiani Manzo2016-08-221-0/+43
* | Remove the SchemaDumper options and change the default behaviorRafael Mendonça França2016-08-224-137/+17
* | Merge pull request #26248 from wjordan/remove-dynamic-segments-docप्रथमेश Sonpatki2016-08-221-25/+11
|\ \
| * | Remove `:action` and `:controller` segments from routing guideWill Jordan2016-08-221-25/+11
|/ /
* | Merge pull request #25750 from go2null/go2null-test-directoriesEileen M. Uchitelle2016-08-221-2/+4
|\ \ | |/ |/|
| * Clearly state purpose of test directoriesgo2null2016-08-221-2/+4
* | Merge pull request #23941 from chiragsinghal/patch-1Kasper Timm Hansen2016-08-223-1/+43
|\ \
| * | Return 307 status instead of 301 when rerouting POST requests to SSLChirag Singhal2016-08-223-1/+43
* | | Merge pull request #26245 from danila/quering-interface-guideVipul A M2016-08-221-2/+2
|\ \ \ | |/ / |/| |
| * | Change form of table name to plural in query exampleDanila Ermakov2016-08-221-2/+2
|/ /
* | Merge pull request #26240 from ojiry/fix_ad_http_url_docप्रथमेश Sonpatki2016-08-221-65/+21
|\ \
| * | Fix `ActionDispatch::Http::URL` docs [ci skip]Ryoji Yoshioka2016-08-221-65/+21
* | | Merge pull request #26241 from scottyantipa/query-interface-docsJon Moss2016-08-211-3/+3
|\ \ \
| * | | Update docs for query interface to not declare that all methods return instan...Scott Antipa2016-08-211-3/+3
| |/ /
* | | Merge pull request #23759 from maclover7/fix-23757Kasper Timm Hansen2016-08-212-1/+16
|\ \ \
| * | | Prevent invocation of channel action if rejected connectionJon Moss2016-08-192-1/+16
* | | | Merge pull request #26234 from y-yagi/remove_unnessary_session_store_settingKasper Timm Hansen2016-08-211-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | remove unnessary `session_store` settingyuuji.yaginuma2016-08-201-1/+0
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-08-215-8/+8
|\ \ \ \
| * | | | When referring to Rails, be consistent in usage of capitalized form, unless i...Vipul A M2016-08-193-4/+4
| * | | | Grammar changes on getting started guide, specify where exactly the example i...Vipul A M2016-08-191-2/+2
| * | | | Fix remaining broadcasting_name example from Action Cable guide [ci skip]Prathamesh Sonpatki2016-08-121-2/+2
* | | | | Merge pull request #26227 from alexcameron89/syntax_highlighter_fixVijay Dev2016-08-201-1/+1
|\ \ \ \ \
| * | | | | Increase margin-bottom for doc's code syntax highlighterAlex Kitchens2016-08-201-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #26232 from kamipo/fix_oid_bit_cast_valueSean Griffin2016-08-202-4/+5
|\ \ \ \ \
| * | | | | Fix `OID::Bit#cast_value`Ryuta Kamizono2016-08-202-4/+5
| |/ / / /
* | | | | Merge pull request #26233 from y-yagi/update_retry_on_exampleप्रथमेश Sonpatki2016-08-201-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | correct exception class in `retry_on` example [ci skip]yuuji.yaginuma2016-08-201-2/+2
|/ / / /
* | | | Merge pull request #26224 from jonatack/consistent-asset-precompile-examplesEileen M. Uchitelle2016-08-195-10/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Consistent examples and template for assets#precompileJon Atack2016-08-195-10/+11
* | | | Merge pull request #26219 from kamipo/remove_unused_blob_or_text_columnRafael França2016-08-192-9/+0
|\ \ \ \
| * | | | Remove unused `blob_or_text_column?` methodRyuta Kamizono2016-08-192-9/+0
* | | | | Merge pull request #26218 from kamipo/remove_unnecessary_lengthRafael França2016-08-192-12/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unnecessary `length` method for collection proxyRyuta Kamizono2016-08-192-12/+6
* | | | | Copy edits in the documentation [ci skip]Rafael Mendonça França2016-08-192-4/+6
* | | | | Merge pull request #26212 from evmunro/as-json-sets-request-to-json-for-contr...Rafael França2016-08-193-1/+22
|\ \ \ \ \
| * | | | | Set the request type if as: is specifiedEverest Munro-Zeisberger2016-08-183-1/+22
* | | | | | Merge pull request #25675 from TimPetricola/schema-no-standardized-column-widthsRafael Mendonça França2016-08-194-11/+125
|\ \ \ \ \ \
| * | | | | | Merge branch 'master' into schema-no-standardized-column-widthsTim Petricola2016-08-184-117/+137
| |\| | | | |
| * | | | | | Option not to line up column types and attributes in schema.rbTim Petricola2016-08-174-14/+128
* | | | | | | Add chengelog entry to #25976Rafael Mendonça França2016-08-191-0/+7
* | | | | | | Merge pull request #26154 from kamipo/remove_text_default_treated_as_empty_st...Rafael Mendonça França2016-08-196-84/+70
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove text default treated as an empty string in non-strict modeRyuta Kamizono2016-08-196-84/+70
* | | | | | | Merge pull request #26217 from kamipo/revert_23067Rafael França2016-08-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "`sql_for_insert` returns values for passing to `exec_insert`"Ryuta Kamizono2016-08-191-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #25989 from kamipo/remove_unnecessary_select_for_collectio...Rafael França2016-08-192-11/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary `select` method for `CollectionProxy`Ryuta Kamizono2016-08-182-11/+6
* | | | | | | | Merge pull request #26216 from y-yagi/fixes_19880Rafael França2016-08-193-2/+16
|\ \ \ \ \ \ \ \