aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #23433 from BillyZac/masterArthur Nogueira Neves2016-02-021-2/+2
|\ \ \
| * | | Fix typo.Zachary Smith2016-02-021-2/+2
* | | | Merge pull request #23429 from qrush/actioncable-doc-updateEileen M. Uchitelle2016-02-024-40/+53
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Several ActionCable documentation updates:Nick Quaranto2016-02-024-40/+53
|/ / /
* | | Ensure tz aware attributes continue to work with arraysSean Griffin2016-02-021-1/+1
* | | Avoid infinite recursion when bad values are passed to tz aware fieldsSean Griffin2016-02-022-2/+19
* | | Merge pull request #23423 from yui-knk/remove_unnecessary_overrideSean Griffin2016-02-021-12/+0
|\ \ \
| * | | Remove unnecessary overriding of `#initialize`yui-knk2016-02-021-12/+0
| | |/ | |/|
* | | Merge pull request #23426 from RyanNielson/patch-1Kasper Timm Hansen2016-02-021-1/+1
|\ \ \ | |/ / |/| |
| * | Change command_task.rb to commands_task.rb in docsRyan Nielson2016-02-021-1/+1
|/ /
* | Merge pull request #23331 from amatsuda/valid_scope_nameRafael França2016-02-022-0/+29
|\ \
| * | Suppress :warning:sAkira Matsuda2016-01-281-1/+1
| * | scope needs the second argumentAkira Matsuda2016-01-281-1/+1
| * | Revert "Remove valid_scope_name? check - use ruby"Akira Matsuda2016-01-282-0/+29
* | | Merge pull request #23420 from y-yagi/move_api_test_to_appropriate_fileRafael França2016-02-022-11/+10
|\ \ \
| * | | move `test_generator_if_skip_action_cable_is_given_for_an_api_app` to the app...yuuji.yaginuma2016-02-022-11/+10
* | | | Merge pull request #23396 from pschambacher/pschambacher/fix_assert_generatesRafael França2016-02-021-0/+1
|\ \ \ \
| * | | | Duplicate assert_generates options before modifying itPierre Schambacher2016-02-011-0/+1
* | | | | Merge pull request #23414 from maclover7/23411Rafael França2016-02-023-3/+16
|\ \ \ \ \
| * | | | | Fix regression in `Hash#dig` for HashWithIndifferentAccess.Jon Moss2016-02-013-3/+16
|/ / / / /
* | / / / Generated engines should protect from forgeryAaron Patterson2016-02-012-3/+4
| |/ / / |/| | |
* | | | :warning: assigned but unused variable - errAkira Matsuda2016-02-021-2/+2
* | | | Merge pull request #23408 from kangkyu/patch-1Claudio B2016-02-011-2/+2
|\ \ \ \
| * | | | Update CHANGELOG.mdKang-Kyu Lee2016-02-011-2/+2
|/ / / /
* | | | Add some Action Cable CHANGELOG entriesRafael Mendonça França2016-02-016-16/+11
* | | | Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-0122-46/+96
* | | | Merge pull request #23407 from jeremy/corrupt-before-commitJeremy Daer2016-02-012-2/+33
|\ \ \ \
| * | | | Fix corrupt transaction state caused by `before_commit` exceptionsJeremy Daer2016-02-012-2/+33
* | | | | Add spaces in the braces.Kasper Timm Hansen2016-02-011-1/+1
* | | | | Converge on filter.Kasper Timm Hansen2016-02-011-5/+4
* | | | | Simplify filter normalization.Kasper Timm Hansen2016-02-011-5/+3
* | | | | Merge pull request #23225 from vipulnsward/20420-rake-routes-optionsKasper Timm Hansen2016-02-017-30/+163
|\ \ \ \ \
| * | | | | Add options for rake routes taskVipul A M2016-02-027-30/+163
* | | | | | Revert "Merge pull request #16400 from bogdan/last-with-sql"Sean Griffin2016-02-013-60/+31
* | | | | | Merge pull request #23398 from matthewd/interlockMatthew Draper2016-02-024-23/+119
|\ \ \ \ \ \
| * | | | | | After completing a load, give other threads a chance tooMatthew Draper2016-02-023-15/+46
| * | | | | | While new sharers are blocked, an existing sharer remains re-entrantMatthew Draper2016-02-022-1/+30
| * | | | | | Block new share attempts if there's an exclusive waiterMatthew Draper2016-02-022-8/+44
| * | | | | | Always obtain the lock and do the unloadMatthew Draper2016-02-021-1/+1
* | | | | | | Merge pull request #23406 from hackerkid/masterVipul A M2016-02-021-5/+5
|\ \ \ \ \ \ \
| * | | | | | | .git added to https repo urlsVishnu Ks2016-02-021-5/+5
* | | | | | | | Merge pull request #23151 from maclover7/fix-23148Rafael França2016-02-012-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Add documentation for #17573Jon Moss2016-02-012-0/+11
* | | | | | | | | Merge pull request #23402 from hackerkid/masterRichard Schneeman2016-02-011-5/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | git protocol replaced with httpsVishnu Ks2016-02-021-5/+5
* | | | | | | | Merge pull request #23025 from yahonda/shorten_internal_metadata_table_name_l...Sean Griffin2016-02-016-14/+42
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Rename `active_record_internal_metadatas` to `ar_internal_metadata`Yasuo Honda2016-02-012-0/+28
| * | | | | | | Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadataYasuo Honda2016-02-015-14/+14
| |/ / / / / /
* | | | | | | Merge pull request #23401 from claudiob/fix-as-changelog-mdClaudio B2016-02-011-29/+29
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [ci skip] Properly indent code in markdownclaudiob2016-02-011-29/+29
|/ / / / / /