Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #8050 from bashmish/master | Carlos Antonio da Silva | 2012-10-28 | 1 | -0/+1 | |
|\ \ | |/ |/| | fix typo in button_to helper example [ci skip] | |||||
| * | fix typo in button_to helper example | Michael Bashkirov | 2012-10-28 | 1 | -0/+1 | |
|/ | ||||||
* | USe the released version of sprockets-rails in a new Rails 4 application | Rafael Mendonça França | 2012-10-27 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #7960 from pwnall/mysql_varbinary | Rafael Mendonça França | 2012-10-27 | 7 | -18/+71 | |
|\ | | | | | Use the MySQL varbinary type when appropriate in migrations | |||||
| * | Use the MySQL varbinary type when appropriate in migrations. | Victor Costan | 2012-10-27 | 7 | -18/+71 | |
| | | ||||||
* | | Improve the deprecation message of link_to_function and | Rafael Mendonça França | 2012-10-27 | 2 | -8/+10 | |
|/ | | | | | | button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide | |||||
* | Merge pull request #8034 from gbchaosmaster/readme-format | Xavier Noria | 2012-10-27 | 2 | -19/+18 | |
|\ | | | | | Organize README | |||||
| * | Organize README | Vinny Diehl | 2012-10-26 | 2 | -19/+18 | |
| | | | | | | | | | | | | | | | | | | * Organized code status badges into a "Code Status" section. * Moved the OSI MIT License link inline (bullets are for unordered lists). * Removed all EOL whitespace. [ci skip] | |||||
* | | Add the Working with JavaScript Guides in the guides home as WIP | Rafael Mendonça França | 2012-10-27 | 1 | -29/+34 | |
| | | ||||||
* | | Merge pull request #8043 from senny/remove_trailing_whitespace_in_actionpack | Rafael Mendonça França | 2012-10-27 | 11 | -17/+17 | |
|\ \ | | | | | | | remove trailing whitespace within actionpack [ci skip] | |||||
| * | | cleanup, remove trailing whitespace within actionpack | Yves Senn | 2012-10-27 | 11 | -17/+17 | |
|/ / | ||||||
* | | Merge pull request #8040 from frodsan/fix_build_isolated | Jeremy Kemper | 2012-10-26 | 1 | -0/+1 | |
|\ \ | | | | | | | fix failing isolated tests in activemodel | |||||
| * | | fix failing isolated tests | Francesco Rodriguez | 2012-10-26 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency | Jeremy Kemper | 2012-10-26 | 5 | -6/+6 | |
|\ \ | | | | | | | Fix AM::Serializers::Xml dependency | |||||
| * | | fix AM::Serializers titles [ci skip] | Francesco Rodriguez | 2012-10-26 | 2 | -2/+2 | |
| | | | ||||||
| * | | AM::Serializers::Xml depends on AM::Naming | Francesco Rodriguez | 2012-10-26 | 4 | -4/+4 | |
|/ / | ||||||
* | | Fix queueing tests that should be consuming the queue rather than draining it | Jeremy Kemper | 2012-10-26 | 2 | -4/+10 | |
| | | ||||||
* | | Job consumer logs to Rails.logger by default | Jeremy Kemper | 2012-10-26 | 3 | -2/+7 | |
| | | ||||||
* | | Job worker thread logs failed jobs too | Jeremy Kemper | 2012-10-26 | 2 | -2/+2 | |
| | | ||||||
* | | Job worker thread logs to stderr if no logger is provided | Jeremy Kemper | 2012-10-26 | 2 | -2/+13 | |
| | | ||||||
* | | Merge pull request #7593 from veader/patch-1 | Rafael Mendonça França | 2012-10-26 | 3 | -1/+15 | |
|\ \ | | | | | | | Decode attributes pulled from URI.parse | |||||
| * | | Decode attributes pulled from URI.parse | Shawn Veader | 2012-10-26 | 3 | -1/+15 | |
| | | | | | | | | | | | | | | | | | | | | | The RFC indicates that username and passwords may be encoded. http://tools.ietf.org/html/rfc2396#section-3.2.2 Found this trying to use the mysql://username:password@host:port/db and having special characters in the password which needed to be URI encoded. | |||||
* | | | Merge pull request #7971 from dgraham/hash-replace | Rafael Mendonça França | 2012-10-26 | 3 | -0/+22 | |
|\ \ \ | |/ / |/| | | Implement HashWithIndifferentAccess#replace so key? works correctly. | |||||
| * | | Implement replace method so key? works correctly. | David Graham | 2012-10-26 | 3 | -0/+22 | |
|/ / | ||||||
* | | remove unused config option | Jon Leighton | 2012-10-26 | 1 | -3/+0 | |
| | | ||||||
* | | Remove ActiveRecord::Model entry from 4.0 Release Notes [ci skip] | Carlos Antonio da Silva | 2012-10-26 | 1 | -8/+0 | |
| | | ||||||
* | | Remove ActiveRecord::Model consant from AS::TestCase | Carlos Antonio da Silva | 2012-10-26 | 1 | -1/+1 | |
| | | | | | | | | Fixing the build. | |||||
* | | Remove REE GC stats since master is 1.9.3 | Jeremy Kemper | 2012-10-26 | 1 | -17/+5 | |
| | | ||||||
* | | Remove ActiveRecord::Model | Jon Leighton | 2012-10-26 | 40 | -642/+232 | |
| | | | | | | | | | | | | | | | | | | | | In the end I think the pain of implementing this seamlessly was not worth the gain provided. The intention was that it would allow plain ruby objects that might not live in your main application to be subclassed and have persistence mixed in. But I've decided that the benefit of doing that is not worth the amount of complexity that the implementation introduced. | |||||
* | | Add missing require for minitest assertions. Breaks calling 'app' in console ↵ | Jeremy Kemper | 2012-10-25 | 1 | -0/+1 | |
| | | | | | | | | otherwise. See 94248ffe1e6f815b8ffab4eb752b60c1e4459d25. | |||||
* | | Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2 | Carlos Antonio da Silva | 2012-10-25 | 1 | -2/+2 | |
|\ \ | | | | | | | Update redcarpet dependency | |||||
| * | | Update redcarpet dependency | Vinny Diehl | 2012-10-25 | 1 | -2/+2 | |
| |/ | | | | | | | | | "~> 2.2.2" from "~> 2.1.1". Also converted all hash rockets in the Gemfile to the 1.9 syntax. | |||||
* | | Merge pull request #8030 from calebthompson/fix-ternary | Rafael Mendonça França | 2012-10-25 | 1 | -2/+5 | |
|\ \ | |/ |/| | Fix gratuitous use of ternary operator | |||||
| * | Fix gratuitous use of ternary operator | Caleb Thompson | 2012-10-25 | 1 | -2/+5 | |
| | | ||||||
* | | remain backwards compatible, exception can be constructed with no arguments | Aaron Patterson | 2012-10-25 | 1 | -1/+3 | |
|/ | ||||||
* | give access to the original exception raised in case of a parse error | Aaron Patterson | 2012-10-25 | 3 | -2/+23 | |
| | ||||||
* | do not lose backtrace information from the raised exception | Aaron Patterson | 2012-10-25 | 2 | -14/+11 | |
| | ||||||
* | fix uninitialized ivar warnings | Aaron Patterson | 2012-10-25 | 1 | -0/+10 | |
| | ||||||
* | Merge pull request #8013 from noahhendrix/master | Aaron Patterson | 2012-10-25 | 2 | -7/+17 | |
|\ | | | | | Pass key to block in cache.fetch on miss | |||||
| * | make the cache test more @tenderlove(ing) and not depend on internal ↵ | Noah Hendrix | 2012-10-23 | 1 | -2/+7 | |
| | | | | | | | | implentation | |||||
| * | pass the key to the block in cache.fetch on misses | Noah Hendrix | 2012-10-23 | 2 | -7/+12 | |
| | | ||||||
* | | Merge pull request #8021 from ugisozols/master | Rafael Mendonça França | 2012-10-24 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix incorrect markdown by removing extra space. [ci skip] | |||||
| * | | Fix incorrect markdown by removing extra space. | Uģis Ozols | 2012-10-24 | 1 | -1/+1 | |
|/ / | ||||||
* | | JS guide: applies guides casing guidelines for titles [ci skip] | Xavier Noria | 2012-10-23 | 1 | -6/+6 | |
| | | ||||||
* | | registers the JS guide in the CHANGELOG [ci skip] | Xavier Noria | 2012-10-23 | 1 | -0/+2 | |
| | | ||||||
* | | JS guide: AJAX -> Ajax | Xavier Noria | 2012-10-23 | 1 | -17/+17 | |
| | | | | | | | | We discussed this on Twitter, seems to be the best option. | |||||
* | | renames the JS guide file name to match the new title [ci skip] | Xavier Noria | 2012-10-23 | 1 | -0/+0 | |
| | | ||||||
* | | adds Rails to the title of the JS guide [ci skip] | Xavier Noria | 2012-10-23 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #8014 from insside/task-test-typos | Rafael Mendonça França | 2012-10-23 | 1 | -1/+1 | |
|\ \ | |/ |/| | changed test case name | |||||
| * | changed test case name | Tima Maslyuchenko | 2012-10-23 | 1 | -1/+1 | |
|/ |