Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | | | Merge pull request #10220 from vipulnsward/interpolate_on_string | Rafael Mendonça França | 2013-04-15 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | interpolate instead of string concat | ||||
| * | | | | interpolate instead of string concat | Vipul A M | 2013-04-15 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #10212 from mariovisic/active_record_doc | Carlos Antonio da Silva | 2013-04-15 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | Add documentation for `collection.create!` on has_many records. [ci skip] | ||||
| * | | | Document collection.create! on has_many associations in ActiveRecord | Mario Visic | 2013-04-15 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-04-13 | 6 | -14/+14 |
|\ \ \ | |||||
| * | | | Corrected paramter to parameter | Carson McDonald | 2013-04-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix :nodoc: mark on AR::AttributeMethods::Serialization [ci skip] | Francesco Rodriguez | 2013-04-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix a typo | Viktar Basharymau | 2013-04-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update to Ryan's new book per his suggestion | Jonathan Roes | 2013-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | See https://github.com/lifo/docrails/commit/edeb98c2745cbf29725eca87332cefb4f273986a#commitcomment-2995521 | ||||
| * | | | minor edit on StatementCache documentation [ci skip] | Francesco Rodriguez | 2013-04-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix links containing stray colons | Benjamin Tan Wei Hao | 2013-04-12 | 1 | -4/+4 |
| | | | | |||||
| * | | | Fix StatementCache docs format [ci skip] | Francesco Rodriguez | 2013-04-11 | 1 | -5/+5 |
| | | | | |||||
* | | | | Merge pull request #10207 from epiclabs/use_define_singleton_method | Xavier Noria | 2013-04-13 | 1 | -4/+2 |
|\ \ \ \ | | | | | | | | | | | use define_singleton_method instead of class_eval | ||||
| * | | | | use define_singleton_method instead of class_eval | Francesco Rodriguez | 2013-04-13 | 1 | -4/+2 |
|/ / / / | |||||
* | | | | Merge pull request #10206 from epiclabs/nodoc_for_missing_method | Xavier Noria | 2013-04-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Add :nodoc: mark to PerThreadRegistry#method_missing [ci skip] | ||||
| * | | | | Add :nodoc: mark to PerThreadRegistry#method_missing [ci skip] | Francesco Rodriguez | 2013-04-13 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #10204 from shmatov/update-git-links | Guillermo Iguaran | 2013-04-13 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Update github links | ||||
| * | | | | update git links | Roman Shmatov | 2013-04-13 | 2 | -3/+3 |
|/ / / / | |||||
* | | | | hides the per thread registry instance, and caches singleton methods | Xavier Noria | 2013-04-13 | 4 | -30/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing code was delegating to the instance with delegate macro calls, or invoking the instance method to reach the object and call its instance methods. But the point is to have a clean class-level interface where the thread local instance is hidden in the implementation. References #11c6973. References #10198. | ||||
* | | | | Merge pull request #10201 from vipulnsward/remove_unused_var_in_guides | Carlos Antonio da Silva | 2013-04-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | remove unused variable | ||||
| * | | | | remove unused variable | Vipul A M | 2013-04-13 | 1 | -1/+1 |
| | | | | |