Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10258 from thenickcox/pending_migrations_plural | Rafael Mendonça França | 2013-04-18 | 1 | -3/+3 |
|\ | | | | | Fix subject-verb agreement in error msg (and other grammar stuff) | ||||
| * | Fix subject-verb agreement in error msg (and other grammar stuff) | thenickcox | 2013-04-17 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #10259 from prathamesh-sonpatki/secure-engine-tests | Carlos Antonio da Silva | 2013-04-17 | 1 | -1/+1 |
|\ \ | | | | | | | Use secure source for rubygems in engine tests | ||||
| * | | Use secure source for rubygems in engine tests | Prathamesh Sonpatki | 2013-04-18 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #10255 from ↵ | Carlos Antonio da Silva | 2013-04-17 | 1 | -18/+14 |
|\ \ | | | | | | | | | | | | | wangjohn/increment_or_decrement_refactoring_in_local_cache Refactoring increment and decrement in local cache | ||||
| * | | The increment and decrement commands in the local cache are exactly the | wangjohn | 2013-04-17 | 1 | -18/+14 |
|/ / | | | | | | | same, so their logic is being refactored. | ||||
* | | Merge pull request #10254 from wangjohn/refactoring_local_cache | Carlos Antonio da Silva | 2013-04-17 | 1 | -8/+6 |
|\ \ | | | | | | | Refactored the storage of a temporary version of the local cache. | ||||
| * | | Refactored the storage of a temporary version of the local cache into | wangjohn | 2013-04-17 | 1 | -8/+6 |
|/ / | | | | | | | its own method. | ||||
* | | activerecord-deprecated_finders 1.0.0 has a bug with has_many :through | Rafael Mendonça França | 2013-04-17 | 1 | -1/+1 |
| | | | | | | | | associations | ||||
* | | Merge pull request #10252 from epiclabs/nodoc_registries | Rafael Mendonça França | 2013-04-17 | 2 | -4/+4 |
|\ \ | | | | | | | add :nodoc: mark to *Registry classes [ci skip] | ||||
| * | | add :nodoc: mark to *Registry classes [ci skip] | Francesco Rodriguez | 2013-04-17 | 3 | -5/+5 |
| | | | |||||
* | | | Add nodoc to LocalCacheRegistry | Rafael Mendonça França | 2013-04-17 | 1 | -1/+1 |
|/ / | | | | | [ci skip] | ||||
* | | Merge pull request #10250 from wangjohn/local_cache_registry | Rafael Mendonça França | 2013-04-17 | 1 | -15/+32 |
|\ \ | | | | | | | Adding a local thread registry to store local caches. | ||||
| * | | Adding a local thread registry to store local caches. | wangjohn | 2013-04-17 | 1 | -15/+32 |
| | | | |||||
* | | | adding a test for root path in the app | Aaron Patterson | 2013-04-17 | 1 | -0/+24 |
|/ / | |||||
* | | Don't need to add activerecord-deprecated_finders on edge and dev | Rafael Mendonça França | 2013-04-17 | 1 | -3/+1 |
| | | | | | | | | | | | | | | applications This gem will not change often to explain it be included in the application Gemfile | ||||
* | | Bump activerecord-deprecated_finders to 1.0.0 | Rafael Mendonça França | 2013-04-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #10249 from shime/descriptive_error_messages | Piotr Sarnacki | 2013-04-17 | 2 | -6/+8 |
|\ \ | | | | | | | more descriptive error messages for class attributes | ||||
| * | | more descriptive NameError's messages for class attributes | Hrvoje Šimić | 2013-04-17 | 2 | -6/+8 |
|/ / | |||||
* | | Merge pull request #10239 from rubys/cache_entry_conversion_problems | Jeremy Kemper | 2013-04-16 | 2 | -52/+51 |
|\ \ | | | | | | | switch (and lazily convert) ivar names to 3.x | ||||
| * | | switch (and lazily convert) ivar names to 3.x | Sam Ruby | 2013-04-16 | 2 | -52/+51 |
| | | | |||||
* | | | Merge pull request #10173 from nashby/element-attributes | Rafael Mendonça França | 2013-04-16 | 3 | -1/+13 |
|\ \ \ | | | | | | | | | options_from_collection_for_select helper takes html attributes | ||||
| * | | | options_from_collection_for_select helper takes html attributes | Vasiliy Ermolovich | 2013-04-11 | 3 | -1/+13 |
| | | | | | | | | | | | | | | | | as the last element of the array | ||||
* | | | | let EXPLAIN use a thread locals registry [John J. Wang & Xavier Noria] | Xavier Noria | 2013-04-16 | 5 | -46/+70 |
| |/ / |/| | | | | | | | | Closes #10198. | ||||
* | | | fixes gemspec | Xavier Noria | 2013-04-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #8206 from kennyj/fix_7619-2 | Rafael Mendonça França | 2013-04-16 | 3 | -3/+15 |
|\ \ \ | | | | | | | | | Fix #7619. 0x prefix must be added when assigning hexadecimal string into bit column in Postgresql, because solving ambiguity. | ||||
| * | | | Fix #7619. 0x prefix must be added when assigning hexadecimal string into ↵ | kennyj | 2013-04-17 | 3 | -3/+15 |
|/ / / | | | | | | | | | | bit column in Postgresql, because solving ambiguity. | ||||
* | | | Ruby On Rails -> Ruby on Rails [ci skip] | Xavier Noria | 2013-04-16 | 1 | -1/+1 |
| | | | |||||
* | | | Copy-edits in the ActiveSupport::Subscriber documentation. | Rafael Mendonça França | 2013-04-16 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | Thank you @fxn :green_heart::yellow_heart::heart::purple_heart::blue_heart: [ci skip] | ||||
* | | | Merge pull request #10218 from dasch/dasch/extract-subscriber-class | Rafael Mendonça França | 2013-04-16 | 3 | -43/+89 |
|\ \ \ | | | | | | | | | Extract a Subscriber base class from LogSubscriber | ||||
| * | | | Extract a base class from ActiveSupport::LogSubscriber | Daniel Schierbeck | 2013-04-16 | 3 | -43/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | Adds a ActiveSupport::Subscriber base class that LogSubscriber inherits from. By inheriting from Subscriber, other kinds of subscribers can take advantage of the event attachment system. | ||||
* | | | | editorial touch, remove these dots | Xavier Noria | 2013-04-16 | 1 | -4/+4 |
| | | | | |||||
* | | | | converts the project README to Markdown | Xavier Noria | 2013-04-16 | 2 | -77/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | We tend to use Markdown for everything but the API, the README is no longer used as the home page of the API after 7a5aa72, so we can now migrate it. | ||||
* | | | | Merge pull request #10230 from gaurish/remove-match | Rafael Mendonça França | 2013-04-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | replace match with get verb in ActionController::Metal | ||||
| * | | | | replace match with get verb in ActionController::Metal | Gaurish Sharma | 2013-04-16 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | The third argument of deprecation_warning is always optional | Rafael Mendonça França | 2013-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | | Fix documentation to the custom Deprecator | Rafael Mendonça França | 2013-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #10228 from prathamesh-sonpatki/AR-Typos | Carlos Antonio da Silva | 2013-04-15 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Fixed typos in AR CHANGELOG | ||||
| * | | | | Fixed typos in AR CHANGELOG | Prathamesh Sonpatki | 2013-04-16 | 1 | -4/+4 |
|/ / / / | |||||
* | | | | Use db:test:load instead of db:test:load_schema | Piotr Sarnacki | 2013-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | db:test:load task should be favored over db:test:load_schema, because it checks for chosen format (ActiveRecord::Base.schema_format). closes #10227 | ||||
* | | | | Merge pull request #10226 from buddhamagnet/master | Rafael Mendonça França | 2013-04-15 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Make [] method more readable | ||||
| * | | | | make [] method in router more readable | buddhamagnet | 2013-04-15 | 1 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #10225 from kennyj/fix_bit_string_problem | Rafael Mendonça França | 2013-04-15 | 3 | -5/+22 |
|\ \ \ \ | | | | | | | | | | | Fix bit string problem | ||||
| * | | | | Add OID::Bit for supporting bit string. | kennyj | 2013-04-16 | 2 | -2/+19 |
| | | | | | |||||
| * | | | | Revert "fixing bit string test" | kennyj | 2013-04-16 | 1 | -3/+3 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit cdd293cb963b895ff580eb20d10f5d56ecb3d447. Reason: This wasn't properly fix. | ||||
* | | | | Merge pull request #10178 from rubys/app_base_strip_heredoc | Rafael Mendonça França | 2013-04-15 | 1 | -14/+12 |
|\ \ \ \ | | | | | | | | | | | Use strip_heredoc where possible | ||||
| * | | | | Use strip_heredoc where possible | Sam Ruby | 2013-04-11 | 1 | -14/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following up on an observation by @rafaelfranca https://github.com/rails/rails/pull/10170/files#r3753963 Reduce the number of gsub calls to the two cases where inputs are concatenated from various sources and with inconsistent indentation. Also zap extraneous spacing from the sass-rails line... presumably this is a holdover from a previous time where this aligned the version string with an adjacent line. | ||||
* | | | | | Merge pull request #10214 from mattetti/ar_postgres_bytea | Rafael Mendonça França | 2013-04-15 | 2 | -0/+88 |
|\ \ \ \ \ | | | | | | | | | | | | | AR postgres binary bug fix | ||||
| * | | | | | fix for the bytea/binary nil value bug | Matt Aimonetti | 2013-04-14 | 2 | -1/+2 |
| | | | | | | |||||
| * | | | | | added a test suite for the postgres binary type | Matt Aimonetti | 2013-04-14 | 1 | -0/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | this shows a problem with nil values |