aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Don’t explicitly mention EventMachineclaudiob2016-01-253-7/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #23251 from kamipo/update_gemfile_lockSean Griffin2016-01-251-32/+32
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Update `Gemfile.lock`Ryuta Kamizono2016-01-261-32/+32
|/ / / / / / /
* | | | | | | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-2532-41/+168
|\ \ \ \ \ \ \
| * | | | | | | bumping versionAaron Patterson2016-01-2511-11/+11
| * | | | | | | fix version update task to deal with .beta1.1Aaron Patterson2016-01-251-1/+1
| * | | | | | | Eliminate instance level writers for class accessorsAaron Patterson2016-01-226-8/+9
| * | | | | | | allow :file to be outside rails root, but anything else must be inside the ra...Aaron Patterson2016-01-229-16/+93
| * | | | | | | Don't short-circuit reject_if procAndrew White2016-01-222-2/+25
| * | | | | | | stop caching mime types globallyAaron Patterson2016-01-221-2/+16
| * | | | | | | use secure string comparisons for basic auth username / passwordAaron Patterson2016-01-222-1/+13
* | | | | | | | Merge pull request #23226 from vipulnsward/20808-fixJon Moss2016-01-254-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix nodoc to internal class error document some of themVipul A M2016-01-254-1/+5
* | | | | | | | | Merge pull request #23161 from schneems/schneems/fix-mysql-internalmetadataRichard Schneeman2016-01-252-9/+36
|\ \ \ \ \ \ \ \ \