aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4930 from ask4prasath/ordered_hash_replacedAaron Patterson2012-02-085-9/+8
|\ | | | | Replacing ordered hash to ruby hash on active model
| * replacing ordered hash to ruby hashprasath2012-02-085-9/+8
| |
* | Merge pull request #4942 from bogdan/pluck_joinsJosé Valim2012-02-082-0/+14
|\ \ | | | | | | AR::Relation#pluck: improve to work with joins
| * | AR::Relation#pluck: improve to work with joinsBogdan Gusiev2012-02-082-0/+14
|/ /
* | Merge pull request #4934 from rafaelfranca/fix-docSantiago Pastorino2012-02-081-1/+1
|\ \ | | | | | | Fix match docs
| * | Fix match docsRafael Mendonça França2012-02-071-1/+1
|/ /
* | Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-073-0/+25
| |
* | Merge pull request #4932 from carlosantoniodasilva/fix-request-testJosé Valim2012-02-071-1/+1
|\ \ | | | | | | Fix failing request test
| * | Fix failing request testCarlos Antonio da Silva2012-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Latest changes in remote ip handling conflicted with each other in tests. Related: dd09811fa6214a130fdc2de1d4c00b4337cb15f9 6a720226aad2adffcbd2422d40db772719579e2f
* | | Update README to mention lint.José Valim2012-02-071-4/+6
| | |
* | | Trim down Active Model API by removing valid? and errors.full_messagesJosé Valim2012-02-074-33/+17
| | |
* | | Merge pull request #4878 from vijaydev/ordinal-2072Xavier Noria2012-02-076-11/+67
|\ \ \ | | | | | | | | PR #2072 with docs
| * | | Document Integer#ordinal available in PR #2072.Vijay Dev2012-02-043-2/+18
| | | | | | | | | | | | | | | | Also remove an unasserted line in the tests.
| * | | Add ActiveSupport::Inflector.ordinal and Integer#ordinalTim Gildea2012-02-044-10/+50
| | | |
* | | | always flush all logs. fixes #4277Aaron Patterson2012-02-071-1/+1
| |/ / |/| |
* | | no need to check for this constantXavier Noria2012-02-071-1/+1
| |/ |/|
* | Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_params_masterJosé Valim2012-02-074-0/+24
|\ \ | | | | | | Fix force_ssl redirect with params
| * | Added unit test to cover changes to RouteSet.url_forRyan McGeary2012-02-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Routing::RouteSet.url_for now handles passing params through to ActionDispatch::Http::Url.url_for Conflicts: actionpack/test/controller/base_test.rb
| * | Fixed force_ssl redirects to include original query paramsRyan McGeary2012-02-073-0/+8
|/ / | | | | | | | | | | | | | | | | | | `ActionController.force_ssl` redirects http URLs to their https equivalent; however, when a URL contains a query string, the resulting redirect lacked the original query string. Conflicts: actionpack/lib/action_controller/metal/force_ssl.rb
* | Merge pull request #2490 from gsterndale/x_forwarded_for_orderJosé Valim2012-02-072-5/+5
|\ \ | | | | | | The first IP address in the X-Forwarded-For header is the originating IP
| * | The first IP address in the X-Forwarded-For header is the originating IPGreg Sterndale2012-02-072-5/+5
| | |
* | | Fix that failed tests should exit with a nonzero error code.Jeremy Kemper2012-02-072-31/+17
| | | | | | | | | | | | | | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask!
* | | Merge pull request #2632 from gsterndale/replace_trusted_proxiesJosé Valim2012-02-072-6/+19
|\ \ \ | | | | | | | | Trusted proxies are configurable
| * | | Trusted proxies is replaced with a Regexp or appended to with a StringGreg Sterndale2012-02-072-6/+19
| |/ /
* | | Merge pull request #4926 from iblue/masterXavier Noria2012-02-071-1/+2
|\ \ \ | | | | | | | | Fixed documenation
| * | | Fixed the documenation for 'to_xml'Markus Fenske2012-02-071-1/+2
| |/ /
* | | Merge pull request #4918 from scottwb/fix-single-accept-with-qJosé Valim2012-02-072-1/+9
|\ \ \ | |/ / |/| | Fix MIME::Type.parse handling of single media with a q value
| * | Correctly handle single media with q value. Fixes #736.Scott W. Bradley2012-02-061-1/+3
| | |
| * | Failing test case that shows issue #736 should still be open.Scott W. Bradley2012-02-061-0/+6
| | |
* | | Merge pull request #4924 from rafaelfranca/fix-asset_tagJosé Valim2012-02-072-16/+16
|\ \ \ | |/ / |/| | Fix audio_tag and video_tag helpers
| * | Always use content_tag for audio/video tagRafael Mendonça França2012-02-072-16/+16
|/ / | | | | | | Closes #4919
* | adding a comment for myselfAaron Patterson2012-02-062-8/+9
| |
* | delegate attribute typecasting to the columnAaron Patterson2012-02-062-16/+17
| |
* | pg supports real booleans, so handle the case when `true` is returnedAaron Patterson2012-02-061-2/+5
| |
* | let automatic EXPLAIN ignore CACHE notificationsXavier Noria2012-02-032-1/+52
| |
* | Merge pull request #4905 from herimedia/to-infinity-and-beyondAaron Patterson2012-02-062-2/+20
|\ \ | | | | | | Infinity should be a valid validates_length_of maximum
| * | To infinity… and beyond!Niels Ganser2012-02-062-2/+20
| | | | | | | | | | | | | | | | | | | | | Allow infinite values for validates_length_of. Particularly useful for prettily defining an open ended range such as validates_length_of :human_stupidity, :within => 0..Float::INFINITY
* | | Merge pull request #4910 from ↵Aaron Patterson2012-02-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | sskirby/fixes_regression_in_postgres_template_support prevents the database.yml template option from being passed to PGConn
| * | | prevents the database.yml template option from being passed to PGConnSean Kirby2012-02-061-1/+1
|/ / /
* | | Merge pull request #4908 from kennyj/fix_3864José Valim2012-02-062-1/+34
|\ \ \ | |/ / |/| | Fix url_for method's behavior. GH #3684.
| * | Fix url_for method's behavior when it is called with :controller option ↵kennyj2012-02-072-1/+34
|/ / | | | | | | | | | | which starts with "/" from multiple nested controller. Closes #3864
* | Merge pull request #4900 from lest/patch-1José Valim2012-02-051-0/+2
|\ \ | | | | | | allow mass-assign version attribute in AR::SchemaMigration
| * | allow mass-assign version attribute in AR::SchemaMigrationSergey Nartimov2012-02-061-0/+2
| | |
* | | Note the ways #match may be calledJeremy Kemper2012-02-051-0/+3
| | |
* | | Revert "Deprecated multi args to http route methods"Jeremy Kemper2012-02-052-13/+1
|/ / | | | | | | | | | | | | | | | | | | Too painful to lose the compact shorthand form! This reverts commit e848c52535fa0f9488cdbdb3f1cedc7c7c02d643. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb
* | Get ActiveRecord::TestCase back on its feet, despite deprecation. It ↵Jeremy Kemper2012-02-053-92/+68
| | | | | | | | requires SQLCounter which was moved to AR internal tests only.
* | Merge pull request #4893 from bcardarella/mark_for_highlightJosé Valim2012-02-053-16/+19
|\ \ | | | | | | Highlight defaults to HTML5 `mark` element
| * | Highlight defaults to HTML5 `mark` elementBrian Cardarella2012-02-053-16/+19
| | |
* | | Merge pull request #4881 from al2o3cr/compatible_json_errorsJeremy Kemper2012-02-053-6/+83
|\ \ \ | |/ / |/| | Make ActiveResource error parsing interoperate with ActionController. Closes #4881.
| * | add handling for backwards-compatibility and update documentationMatt Jones2012-02-043-4/+67
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 18:00:59 +0000