aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #10173 from nashby/element-attributesRafael Mendonça França2013-04-163-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | options_from_collection_for_select helper takes html attributes
| * | | | | | | options_from_collection_for_select helper takes html attributesVasiliy Ermolovich2013-04-113-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the last element of the array
* | | | | | | | let EXPLAIN use a thread locals registry [John J. Wang & Xavier Noria]Xavier Noria2013-04-165-46/+70
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Closes #10198.
* | | | | | | fixes gemspecXavier Noria2013-04-161-1/+1
| | | | | | |
* | | | | | | Merge pull request #8206 from kennyj/fix_7619-2Rafael Mendonça França2013-04-163-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 ↵kennyj2013-04-173-3/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | bit column in Postgresql, because solving ambiguity.
* | | | | | | Ruby On Rails -> Ruby on Rails [ci skip]Xavier Noria2013-04-161-1/+1
| | | | | | |
* | | | | | | Copy-edits in the ActiveSupport::Subscriber documentation.Rafael Mendonça França2013-04-161-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-classRafael Mendonça França2013-04-163-43/+89
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Extract a Subscriber base class from LogSubscriber
| * | | | | | Extract a base class from ActiveSupport::LogSubscriberDaniel Schierbeck2013-04-163-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 dotsXavier Noria2013-04-161-4/+4
| | | | | | |
* | | | | | | converts the project README to MarkdownXavier Noria2013-04-162-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-matchRafael Mendonça França2013-04-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | replace match with get verb in ActionController::Metal
| * | | | | | | replace match with get verb in ActionController::MetalGaurish Sharma2013-04-161-1/+1
|/ / / / / / /
* | | | | | | The third argument of deprecation_warning is always optionalRafael Mendonça França2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Fix documentation to the custom DeprecatorRafael Mendonça França2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #10228 from prathamesh-sonpatki/AR-TyposCarlos Antonio da Silva2013-04-151-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed typos in AR CHANGELOG
| * | | | | | | Fixed typos in AR CHANGELOGPrathamesh Sonpatki2013-04-161-4/+4
|/ / / / / / /
* | | | | / / Use db:test:load instead of db:test:load_schemaPiotr Sarnacki2013-04-161-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/masterRafael Mendonça França2013-04-151-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make [] method more readable
| * | | | | | make [] method in router more readablebuddhamagnet2013-04-151-1/+3
|/ / / / / /
* | | | | | Merge pull request #10225 from kennyj/fix_bit_string_problemRafael Mendonça França2013-04-153-5/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix bit string problem
| * | | | | | Add OID::Bit for supporting bit string.kennyj2013-04-162-2/+19
| | | | | | |
| * | | | | | Revert "fixing bit string test"kennyj2013-04-161-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cdd293cb963b895ff580eb20d10f5d56ecb3d447. Reason: This wasn't properly fix.
* | | | | | Merge pull request #10178 from rubys/app_base_strip_heredocRafael Mendonça França2013-04-151-14/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use strip_heredoc where possible
| * | | | | | Use strip_heredoc where possibleSam Ruby2013-04-111-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_byteaRafael Mendonça França2013-04-152-0/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | AR postgres binary bug fix
| * | | | | | | fix for the bytea/binary nil value bugMatt Aimonetti2013-04-142-1/+2
| | | | | | | |
| * | | | | | | added a test suite for the postgres binary typeMatt Aimonetti2013-04-141-0/+87
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | this shows a problem with nil values
* | | | | | | Merge pull request #10220 from vipulnsward/interpolate_on_stringRafael Mendonça França2013-04-151-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | interpolate instead of string concat
| * | | | | | interpolate instead of string concatVipul A M2013-04-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #10212 from mariovisic/active_record_docCarlos Antonio da Silva2013-04-151-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add documentation for `collection.create!` on has_many records. [ci skip]
| * | | | | Document collection.create! on has_many associations in ActiveRecordMario Visic2013-04-151-0/+4
|/ / / / /
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-136-14/+14
|\ \ \ \ \
| * | | | | Corrected paramter to parameterCarson McDonald2013-04-131-1/+1
| | | | | |
| * | | | | fix :nodoc: mark on AR::AttributeMethods::Serialization [ci skip]Francesco Rodriguez2013-04-121-2/+2
| | | | | |
| * | | | | Fix a typoViktar Basharymau2013-04-121-1/+1
| | | | | |
| * | | | | Update to Ryan's new book per his suggestionJonathan Roes2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | See https://github.com/lifo/docrails/commit/edeb98c2745cbf29725eca87332cefb4f273986a#commitcomment-2995521
| * | | | | minor edit on StatementCache documentation [ci skip]Francesco Rodriguez2013-04-121-1/+1
| | | | | |
| * | | | | Fix links containing stray colonsBenjamin Tan Wei Hao2013-04-121-4/+4
| | | | | |
| * | | | | Fix StatementCache docs format [ci skip]Francesco Rodriguez2013-04-111-5/+5
| | | | | |
* | | | | | Merge pull request #10207 from epiclabs/use_define_singleton_methodXavier Noria2013-04-131-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | use define_singleton_method instead of class_eval
| * | | | | | use define_singleton_method instead of class_evalFrancesco Rodriguez2013-04-131-4/+2
|/ / / / / /
* | | | | | Merge pull request #10206 from epiclabs/nodoc_for_missing_methodXavier Noria2013-04-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add :nodoc: mark to PerThreadRegistry#method_missing [ci skip]
| * | | | | | Add :nodoc: mark to PerThreadRegistry#method_missing [ci skip]Francesco Rodriguez2013-04-131-1/+1
|/ / / / / /
* | | | | | Merge pull request #10204 from shmatov/update-git-linksGuillermo Iguaran2013-04-132-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update github links
| * | | | | | update git linksRoman Shmatov2013-04-132-3/+3
|/ / / / / /
* | | | | | hides the per thread registry instance, and caches singleton methodsXavier Noria2013-04-134-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_guidesCarlos Antonio da Silva2013-04-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unused variable
| * | | | | | remove unused variableVipul A M2013-04-131-1/+1
| | | | | | |