aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Implemented pull request changes.Ryan Manuel2016-01-292-10/+5
* Update doc with appropriate issue and pull request versionsRyan Manuel2016-01-282-2/+2
* Add an after_bundle callback in Rails plugin templatesRyan Manuel2016-01-285-2/+47
* Merge pull request #23307 from mgrachev/fix-schema-migrationsEileen M. Uchitelle2016-01-281-1/+1
|\
| * Fix a bug with initialize schema_migrations tableMikhail Grachev2016-01-281-1/+1
* | Merge pull request #23237 from gsamokovarov/new-welcome-pageDavid Heinemeier Hansson2016-01-284-268/+65
|\ \
| * | Introduce new welcome page for new projectsGenadi Samokovarov2016-01-264-268/+65
* | | Merge pull request #23303 from Empact/find-nth-deprecationRafael França2016-01-281-11/+10
|\ \ \
| * | | Consistently warn that passing an offset to `find_nth` is deprecatedBen Woosley2016-01-271-11/+10
* | | | :arrow_left: indentationAkira Matsuda2016-01-281-2/+2
| |_|/ |/| |
* | | Merge pull request #23299 from CollinGraves/patch-1प्रथमेश Sonpatki2016-01-281-0/+2
|\ \ \
| * | | English explanation to multi-level nested joinCollin Graves2016-01-271-0/+2
* | | | Merge pull request #18928 from bogdan/unreversable-orderSean Griffin2016-01-274-2/+69
|\ \ \ \ | |/ / / |/| | |
| * | | Introduce ActiveRecord::IrreversibleOrderErrorBogdan Gusiev2016-01-274-2/+69
* | | | Merge pull request #23291 from maclover7/suckerpunch-docs-updateJon Moss2016-01-271-6/+4
|\ \ \ \
| * | | | Update sucker_punch adapter's descriptionJon Moss2016-01-271-6/+4
* | | | | remove == from AcceptItemAaron Patterson2016-01-271-6/+7
* | | | | remove useless private methodsAaron Patterson2016-01-271-13/+9
* | | | | change `@app_xml_idx` to an lvar and cache it on the stackAaron Patterson2016-01-271-16/+10
* | | | | change `@text_xml_idx` to an lvar and cache it on the stackAaron Patterson2016-01-271-13/+11
|/ / / /
* | | | Remove celluloid from the GemfileRafael Mendonça França2016-01-273-25/+1
* | | | Merge pull request #23284 from maclover7/suckerpunch-2Eileen M. Uchitelle2016-01-274-9/+21
|\ \ \ \
| * | | | Update ActiveJob adapter for sucker_punch 2.0Jon Moss2016-01-274-9/+21
* | | | | Add tests to #23288Rafael Mendonça França2016-01-271-0/+1
* | | | | Merge pull request #23288 from bdewater/sprockets3-sha2-altRafael França2016-01-272-1/+6
|\ \ \ \ \
| * | | | | Fix img alt attribute generation when using Sprockets >= 3.0Bart de Water2016-01-272-1/+6
* | | | | | Merge pull request #23289 from keram/patch-1Arthur Nogueira Neves2016-01-271-2/+2
|\ \ \ \ \ \
| * | | | | | Fix typo in strong params hash deprecation messageMarek2016-01-271-2/+2
|/ / / / / /
* / / / / / Do not use default attributes for STI when instantiating a subclassSean Griffin2016-01-272-1/+9
|/ / / / /
* | | | | Merge pull request #23281 from djoume/patch-1Kasper Timm Hansen2016-01-271-3/+3
|\ \ \ \ \
| * | | | | Fix typos in asset_pipeline.mdDjoume Salvetti2016-01-271-3/+3
|/ / / / /
* | | | | Merge pull request #21791 from sonalkr132/persistence-docArthur Nogueira Neves2016-01-271-8/+9
|\ \ \ \ \
| * | | | | Improvement in ActiveRecord::Persistence doc [ci skip]Aditya Prakash2015-10-171-8/+9
* | | | | | Merge pull request #23278 from eldano/fix_docVipul A M2016-01-271-1/+1
|\ \ \ \ \ \
| * | | | | | Fix doc [ci skip]Daniel Gomez de Souza2016-01-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #23277 from rails/revert-23152-actioncable-concurrentDavid Heinemeier Hansson2016-01-2727-385/+106
|\ \ \ \ \ \
| * | | | | | Revert "Eliminate the EventMachine dependency"David Heinemeier Hansson2016-01-2727-385/+106
|/ / / / / /
* | | | | | Merge pull request #23275 from aditya-kapoor/remove-dupsप्रथमेश Sonpatki2016-01-271-4/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | remove duplication section [ci skip]Aditya Kapoor2016-01-271-4/+0
| | |/ / / | |/| | |
* | | | | doc typoAkira Matsuda2016-01-271-2/+2
* | | | | INSERT INTO schema_migrations in 1 SQLAkira Matsuda & Naoto Koshikawa2016-01-272-10/+13
|/ / / /
* | | | add a skip for failing testAaron Patterson2016-01-261-1/+2
* | | | fix permitted? conditional for `render` callsAaron Patterson2016-01-262-3/+17
* | | | Merge pull request #23242 from maclover7/fix-error-secAaron Patterson2016-01-262-9/+6
|\ \ \ \
| * | | | Fix sanitizer testsJon Moss2016-01-261-3/+3
| * | | | Fix undefined error for `ActionController::Parameters`Jon Moss2016-01-261-6/+3
| | |_|/ | |/| |
* | | | clear view path cache between testsAaron Patterson2016-01-261-0/+5
* | | | Merge pull request #23256 from pauloancheta/masterRafael França2016-01-261-1/+1
|\ \ \ \
| * | | | reflect mapping to match initializePaulo Ancheta2016-01-251-1/+1
* | | | | Merge pull request #23228 from claudiob/no-emClaudio B2016-01-253-7/+6
|\ \ \ \ \