Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #23291 from maclover7/suckerpunch-docs-update | Jon Moss | 2016-01-27 | 1 | -6/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update sucker_punch adapter's description | Jon Moss | 2016-01-27 | 1 | -6/+4 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | remove == from AcceptItem | Aaron Patterson | 2016-01-27 | 1 | -6/+7 | |
* | | | | | | | | | remove useless private methods | Aaron Patterson | 2016-01-27 | 1 | -13/+9 | |
* | | | | | | | | | change `@app_xml_idx` to an lvar and cache it on the stack | Aaron Patterson | 2016-01-27 | 1 | -16/+10 | |
* | | | | | | | | | change `@text_xml_idx` to an lvar and cache it on the stack | Aaron Patterson | 2016-01-27 | 1 | -13/+11 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Remove celluloid from the Gemfile | Rafael Mendonça França | 2016-01-27 | 3 | -25/+1 | |
* | | | | | | | | Merge pull request #23284 from maclover7/suckerpunch-2 | Eileen M. Uchitelle | 2016-01-27 | 4 | -9/+21 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update ActiveJob adapter for sucker_punch 2.0 | Jon Moss | 2016-01-27 | 4 | -9/+21 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Add tests to #23288 | Rafael Mendonça França | 2016-01-27 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #23288 from bdewater/sprockets3-sha2-alt | Rafael França | 2016-01-27 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix img alt attribute generation when using Sprockets >= 3.0 | Bart de Water | 2016-01-27 | 2 | -1/+6 | |
* | | | | | | | | | Merge pull request #23289 from keram/patch-1 | Arthur Nogueira Neves | 2016-01-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix typo in strong params hash deprecation message | Marek | 2016-01-27 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* / / / / / / / / | Do not use default attributes for STI when instantiating a subclass | Sean Griffin | 2016-01-27 | 2 | -1/+9 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23281 from djoume/patch-1 | Kasper Timm Hansen | 2016-01-27 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix typos in asset_pipeline.md | Djoume Salvetti | 2016-01-27 | 1 | -3/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #21791 from sonalkr132/persistence-doc | Arthur Nogueira Neves | 2016-01-27 | 1 | -8/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improvement in ActiveRecord::Persistence doc [ci skip] | Aditya Prakash | 2015-10-17 | 1 | -8/+9 | |
* | | | | | | | | | Merge pull request #23278 from eldano/fix_doc | Vipul A M | 2016-01-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix doc [ci skip] | Daniel Gomez de Souza | 2016-01-27 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #23277 from rails/revert-23152-actioncable-concurrent | David Heinemeier Hansson | 2016-01-27 | 27 | -385/+106 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Revert "Eliminate the EventMachine dependency" | David Heinemeier Hansson | 2016-01-27 | 27 | -385/+106 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #23275 from aditya-kapoor/remove-dups | प्रथमेश Sonpatki | 2016-01-27 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | remove duplication section [ci skip] | Aditya Kapoor | 2016-01-27 | 1 | -4/+0 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | doc typo | Akira Matsuda | 2016-01-27 | 1 | -2/+2 | |
* | | | | | | | | INSERT INTO schema_migrations in 1 SQL | Akira Matsuda & Naoto Koshikawa | 2016-01-27 | 2 | -10/+13 | |
|/ / / / / / / | ||||||
* | | | | | | | add a skip for failing test | Aaron Patterson | 2016-01-26 | 1 | -1/+2 | |
* | | | | | | | fix permitted? conditional for `render` calls | Aaron Patterson | 2016-01-26 | 2 | -3/+17 | |
* | | | | | | | Merge pull request #23242 from maclover7/fix-error-sec | Aaron Patterson | 2016-01-26 | 2 | -9/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix sanitizer tests | Jon Moss | 2016-01-26 | 1 | -3/+3 | |
| * | | | | | | | Fix undefined error for `ActionController::Parameters` | Jon Moss | 2016-01-26 | 1 | -6/+3 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | clear view path cache between tests | Aaron Patterson | 2016-01-26 | 1 | -0/+5 | |
* | | | | | | | Merge pull request #23256 from pauloancheta/master | Rafael França | 2016-01-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | reflect mapping to match initialize | Paulo Ancheta | 2016-01-25 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #23228 from claudiob/no-em | Claudio B | 2016-01-25 | 3 | -7/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ci skip] Don’t explicitly mention EventMachine | claudiob | 2016-01-25 | 3 | -7/+6 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23251 from kamipo/update_gemfile_lock | Sean Griffin | 2016-01-25 | 1 | -32/+32 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Update `Gemfile.lock` | Ryuta Kamizono | 2016-01-26 | 1 | -32/+32 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch '5-0-beta-sec' | Aaron Patterson | 2016-01-25 | 32 | -41/+168 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | bumping version | Aaron Patterson | 2016-01-25 | 11 | -11/+11 | |
| * | | | | | | | fix version update task to deal with .beta1.1 | Aaron Patterson | 2016-01-25 | 1 | -1/+1 | |
| * | | | | | | | Eliminate instance level writers for class accessors | Aaron Patterson | 2016-01-22 | 6 | -8/+9 | |
| * | | | | | | | allow :file to be outside rails root, but anything else must be inside the ra... | Aaron Patterson | 2016-01-22 | 9 | -16/+93 | |
| * | | | | | | | Don't short-circuit reject_if proc | Andrew White | 2016-01-22 | 2 | -2/+25 | |
| * | | | | | | | stop caching mime types globally | Aaron Patterson | 2016-01-22 | 1 | -2/+16 | |
| * | | | | | | | use secure string comparisons for basic auth username / password | Aaron Patterson | 2016-01-22 | 2 | -1/+13 | |
* | | | | | | | | Merge pull request #23226 from vipulnsward/20808-fix | Jon Moss | 2016-01-25 | 4 | -1/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix nodoc to internal class error document some of them | Vipul A M | 2016-01-25 | 4 | -1/+5 | |
* | | | | | | | | | Merge pull request #23161 from schneems/schneems/fix-mysql-internalmetadata | Richard Schneeman | 2016-01-25 | 2 | -9/+36 | |
|\ \ \ \ \ \ \ \ \ |