aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Initializer provides its context class nameta1kt0me2016-06-123-3/+10
* Delegate public method for raitile nameta1kt0me2016-06-112-1/+3
* Display railtie class name in `rails initializers`ta1kt0me2016-06-021-1/+1
* 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
* | | | Merge pull request #25207 from rajatbansal93/fix-typosJon Moss2016-05-314-6/+6
|\ \ \ \
| * | | | fix grammarRajat Bansal2016-05-314-6/+6
| | |_|/ | |/| |
* | | | Ensure hashes can be passed to attributes using `composed_of`Sean Griffin2016-05-314-5/+21
| |/ / |/| |
* | | Bump jbuilder dependency to version 2.5.0 for compatibility fixesDavid Heinemeier Hansson2016-05-311-1/+1
|/ /
* | Merge pull request #25206 from maclover7/jm-ap-testsRafael França2016-05-312-18/+18
|\ \
| * | Move `Workshop` class definitionJon Moss2016-05-302-18/+18
|/ /
* | Merge pull request #25179 from kamipo/reuse_result_of_associated_tableSean Griffin2016-05-301-2/+3
|\ \
| * | Reuse a result of `table.associated_table(column)` in `AssociationQueryHandle...Ryuta Kamizono2016-05-281-2/+3
* | | Exists shouldn't error when used with `includes`Sean Griffin2016-05-304-11/+9
* | | Merge pull request #25194 from vipulnsward/use-cipherKasper Timm Hansen2016-05-301-1/+1
|\ \ \
| * | | use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher for cipher ...Vipul A M2016-05-291-1/+1
* | | | Ensure that instances of `ActiveModel::Errors` can be marshalledSean Griffin2016-05-302-2/+32
* | | | Merge pull request #25175 from kamipo/fix_migration_class_names_in_testsKasper Timm Hansen2016-05-306-6/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix migration class names in testsRyuta Kamizono2016-05-286-6/+6
* | | | Tiny document fixes [ci skip]Robin Dupret2016-05-302-2/+2
| |/ / |/| |
* | | Merge pull request #22240 from resource11/resource11-patch-1Arthur Nogueira Neves2016-05-291-4/+4
|\ \ \
| * | | Issue 22240: adds link to list of instance methods [ci skip]Kathleen McMahon2016-03-181-4/+4
* | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |