aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* sqlite3_mem has an existing connectionMatthew Draper2015-05-181-1/+3
* better `add_reference` documentation. [ci skip]Yves Senn2015-05-182-20/+18
* Merge pull request #20182 from repinel/remove-assigns-from-api-doc1Yves Senn2015-05-181-2/+2
|\
| * [ci skip] remove `assigns` from the integration test example in API docsRoque Pinel2015-05-171-2/+2
|/
* Merge pull request #20178 from vngrs/fix_wrong_default_value_of_javascript_en...Santiago Pastorino2015-05-171-1/+1
|\
| * config.generators javascript_engine default value is :js not nil [ci skip]Mehmet Emin İNAÇ2015-05-171-1/+1
* | Merge pull request #20179 from gouravtiwari/patch-5Santiago Pastorino2015-05-171-5/+6
|\ \
| * | formatting changes [ci skip]Gourav Tiwari2015-05-171-5/+6
| |/
* | Merge pull request #20180 from vngrs/add_missing_documentation_about_generato...Santiago Pastorino2015-05-171-0/+1
|\ \ | |/ |/|
| * add missing documentation about generators resource_route [ci skip]Mehmet Emin İNAÇ2015-05-171-0/+1
|/
* Merge pull request #20176 from repinel/remove_test_unit_from_docsAbdelkader Boudih2015-05-172-5/+5
|\
| * [ci skip] remove unnecessary mention to Test::Unit from docsRoque Pinel2015-05-162-5/+5
|/
* Merge pull request #20173 from imtayadeway/tw/active-record-validations-docsKasper Timm Hansen2015-05-161-12/+12
|\
| * [ci skip] Improve grammar/syntax in AR validations docs.Tim Wade2015-05-161-12/+12
* | Merge pull request #20172 from prathamesh-sonpatki/changelog-passArun Agrawal2015-05-165-9/+13
|\ \
| * | Pass over CHANGELOGS [ci skip]Prathamesh Sonpatki2015-05-165-9/+13
|/ /
* | Merge pull request #14938 from thedarkone/pool-lock-fixMatthew Draper2015-05-165-92/+577
|\ \ | |/ |/|
| * AR::ConPool - remove synchronization around connection cache.thedarkone2015-05-143-84/+436
| * AR::ConPool - establish connections outside of critical section.thedarkone2015-05-143-28/+136
| * AR::ConPool - reduce post checkout critical section.thedarkone2015-05-143-14/+38
* | Merge pull request #20159 from vngrs/remove_unnecessary_set_requiresSantiago Pastorino2015-05-143-3/+0
|\ \
| * | Remove redundant require 'set' linesMehmet Emin İNAÇ2015-05-153-3/+0
* | | Merge pull request #20160 from ankit8898/security-guideSantiago Pastorino2015-05-141-1/+1
|\ \ \ | |/ / |/| |
| * | Dead blog/site links [ci skip]Ankit Gupta2015-05-141-1/+1
|/ /
* | Merge pull request #20155 from y-yagi/remove_warning_from_integer_ext_testCarlos Antonio da Silva2015-05-141-2/+2
|\ \
| * | remove warning from integer ext testyuuji.yaginuma2015-05-141-2/+2
* | | Merge pull request #20153 from nygrenh/remove-local_assigns-clutterMatthew Draper2015-05-144-1/+14
|\ \ \
| * | | Do not put partial name to local_assigns when rendering without an objectHenrik Nygren2015-05-144-1/+14
| |/ /
* | | Merge pull request #20113 from claudiob/remove-rails31-refsYves Senn2015-05-146-34/+15
|\ \ \ | |/ / |/| |
| * | [ci skip] Remove comments about Rails 3.1claudiob2015-05-116-34/+15
* | | Merge pull request #20151 from imtayadeway/tw/active-record-migrations-docsZachary Scott2015-05-131-2/+2
|\ \ \
| * | | [ci skip] Improve phrasing in AR migrations docs.Tim Wade2015-05-131-2/+2
* | | | Merge pull request #20146 from karanarora/Doc-fixesClaudio B.2015-05-131-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Rails documentation standard is american english. [ci skip]karanarora2015-05-141-1/+1
* | | | Merge pull request #20150 from karanarora/Typo-fixRafael Mendonça França2015-05-131-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | remove redundant parenthesiskaranarora2015-05-141-1/+1
* | | | Merge pull request #20149 from karanarora/Typo-fixRafael Mendonça França2015-05-131-11/+11
|\| | |
| * | | remove redundant parenthesis. karanarora2015-05-141-11/+11
| |/ /
* | | Merge pull request #20142 from zoltankiss/comment_fixRafael Mendonça França2015-05-131-4/+4
|\ \ \
| * | | Minor comment fix. [ci skip]Zoltan Kiss2015-05-131-4/+4
|/ / /
* | | Add Integer#positive? and Integer#negative? query methods in the vein of Fixn...David Heinemeier Hansson2015-05-134-0/+37
* | | Remove not used `options` argument from `ActiveSupport::JSON.decode`Carlos Antonio da Silva2015-05-131-8/+2
* | | Merge pull request #20121 from matthewrudy/remove-sanitize-hashSean Griffin2015-05-131-3/+1
|\ \ \
| * | | remove documentation for sanitize_sql_for_conditions with a HashMatthew Rudy Jacobs2015-05-121-2/+1
| * | | Remove call to sanitize_sql_hash_for_conditionsMatthew Rudy Jacobs2015-05-121-1/+0
* | | | invalid sti error message contains the full class name.Yves Senn2015-05-132-1/+12
* | | | Merge branch 'sti-subclass-from-attributes' of https://github.com/agrobbin/ra...Yves Senn2015-05-134-6/+23
|\ \ \ \
| * | | | allow setting of a demodulized class name when using STIAlex Robbin2015-05-114-6/+23
* | | | | Merge pull request #20136 from mcfiredrill/nodoc-postgresql-add-columnYves Senn2015-05-131-3/+1
|\ \ \ \ \
| * | | | | :nodoc: postgresql add_columnTony Miller2015-05-131-3/+1
|/ / / / /