aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24965 from arthurnn/arthurnn/conn_apiArthur Nogueira Neves2016-05-297-37/+43
|\
| * Add to_hash to specificationArthur Neves2016-05-254-4/+7
| * Remove `name` from `establish_connection`Arthur Neves2016-05-247-33/+32
| * Move establish_connection to handlerArthur Neves2016-05-243-14/+18
* | Merge pull request #25184 from prathamesh-sonpatki/move-up-framework-initiali...David Heinemeier Hansson2016-05-2911-35/+37
|\ \
| * | Move new default initializers into separate directoryPrathamesh Sonpatki2016-05-2811-35/+37
* | | Merge pull request #25190 from willnet/fix-action-cable-guidesप्रथमेश Sonpatki2016-05-291-1/+1
|\ \ \
| * | | [ci skip]Fix wrong require path raising LoadErrorwillnet2016-05-291-1/+1
|/ / /
* | | Merge pull request #25189 from xtian/patch-1प्रथमेश Sonpatki2016-05-291-5/+5
|\ \ \
| * | | ActionController::Parameters: Fix #dig doc codeChristian Wesselhoeft2016-05-291-5/+5
|/ / /
* | | Merge pull request #25188 from y-yagi/rename_enum_prefix_suffixKasper Timm Hansen2016-05-291-2/+3
|\ \ \ | |/ / |/| |
| * | rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip]yuuji.yaginuma2016-05-291-2/+3
|/ /
* | Fix more assertion counts.Kasper Timm Hansen2016-05-281-2/+2
* | Fix assertion count after 69e1bb52.Kasper Timm Hansen2016-05-281-2/+2
* | Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-282-1/+18
|\ \
| * | Remove public/ files for API appsPrathamesh Sonpatki2016-05-282-1/+18
* | | Redirects are to urls, not pathsDavid Heinemeier Hansson2016-05-281-3/+3
* | | The first comment does not explain anything that the code doesnt and the seco...David Heinemeier Hansson2016-05-281-2/+0
* | | Boil down custom Action Cable configuration to a single blockDavid Heinemeier Hansson2016-05-281-4/+2
|/ /
* | Merge pull request #25177 from y-yagi/fix_class_nameप्रथमेश Sonpatki2016-05-282-2/+2
|\ \
| * | fix incorrect class name [ci skip]yuuji.yaginuma2016-05-282-2/+2
|/ /
* | Merge pull request #25176 from kamipo/use_add_index_in_guidesVipul A M2016-05-271-1/+1
|\ \
| * | Use `add_index` instead of `execute` in guides [ci skip]Ryuta Kamizono2016-05-281-1/+1
|/ /
* | Merge pull request #25172 from imtayadeway/activejob/after-enqueue-docVipul A M2016-05-271-2/+2
|\ \
| * | [ci skip] Reword doc for around_enqueue callbackTim Wade2016-05-271-2/+2
|/ /
* | Merge pull request #25171 from matkoniecz/cosmetic_updatesVipul A M2016-05-271-1/+1
|\ \
| * | cometic updates to security guide - fixes #25058 [ci skip]Mateusz Konieczny2016-05-271-1/+1
|/ /
* | Merge pull request #25160 from kamipo/remove_association_for_tableRafael França2016-05-271-6/+0
|\ \
| * | Remove unused `association_for_table` private methodRyuta Kamizono2016-05-271-6/+0
* | | Merge pull request #25162 from willnet/fix-guidesप्रथमेश Sonpatki2016-05-271-1/+1
|\ \ \
| * | | [ci skip] Fix ActionCable Guideswillnet2016-05-271-1/+1
| |/ /
* | | Merge pull request #25164 from y-yagi/add_missing_as_option_to_deprecation_me...Kasper Timm Hansen2016-05-271-2/+3
|\ \ \
| * | | add missing `as` to request kwargs of `ActionDispatch::IntegrationTest`yuuji.yaginuma2016-05-271-2/+3
| |/ /
* | | Merge pull request #25157 from maclover7/jm-23930-add-testsKasper Timm Hansen2016-05-271-0/+8
|\ \ \ | |/ / |/| |
| * | Add test for `delegate_missing_to` where method doesn't existJon Moss2016-05-261-0/+8
* | | Merge pull request #25158 from xhpwn/masterArun Agrawal2016-05-271-1/+1
|\ \ \ | |/ / |/| |
| * | Bash markdown syntaxAnubhav Saxena2016-05-271-1/+1
|/ /
* | Merge pull request #25146 from maclover7/fix-25128Sean Griffin2016-05-262-1/+20
|\ \
| * | Fix `has_one` `enum` `where` queriesJon Moss2016-05-262-1/+20
* | | Merge pull request #25153 from jaredbeck/docs_re_assoc_persistVipul A M2016-05-261-4/+4
|\ \ \ | |/ / |/| |
| * | Docs: Clarify when assoc. methods persistJared Beck2016-05-261-4/+4
|/ /
* | autoloading guide: specify autoload paths are set when the app boots [ci skip]Xavier Noria2016-05-261-3/+4
* | Merge pull request #25139 from vipulnsward/revert-bundler-versionJeremy Daer2016-05-251-1/+1
|\ \
| * | Revert back to a compatible bundler versionVipul A M2016-05-251-1/+1
* | | Merge pull request #25138 from ysksn/test_delegationRafael França2016-05-251-0/+15
|\ \ \ | |/ / |/| |
| * | Add tests for keyword arg to: for Module#delegateYosuke Kabuto2016-05-251-0/+15
| |/
* / CI: run Action Cable browser tests in Sauce LabsJon Moss2016-05-256-3/+61
|/
* Merge pull request #25134 from malept/consistent-hash-examplesJon Moss2016-05-241-6/+6
|\
| * Normalize whitespace for Hash#compact documentation [ci skip]Mark Lee2016-05-241-6/+6
|/
* Don't delegate to private methods of the targerRafael Mendonça França2016-05-242-1/+19