aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change JoinPart test from an integration to a unit testKelley Reynolds2012-07-052-13/+8
|
* Fix eagerly loading associations without primary keysKelley Reynolds2012-02-092-1/+14
|
* Merge pull request #4973 from kennyj/fix_4909Aaron Patterson2012-02-092-1/+1
|\ | | | | Fix GH #4909. Dependency on TZInfo move from AR to AS.
| * Fix GH #4909. Dependency on TZInfo move from AR to AS.kennyj2012-02-102-1/+1
|/
* Merge pull request #4963 from ram123naresh/update_rails_2_use1_9Santiago Pastorino2012-02-091-3/+1
|\ | | | | Replaced OrderedHash usage with Ruby 1.9 Hash
| * Replaced OrderedHash usage with Ruby 1.9 HashUddhava2012-02-091-3/+1
| |
* | Merge pull request #4965 from raghunadhd/fix_hashXavier Noria2012-02-091-2/+1
|\ \ | | | | | | Refactored the OrderedHash related stuff
| * | Refactored the OrderedHash related stuffRaghunadh2012-02-091-2/+1
| | |
* | | Merge pull request #4966 from Karunakar/moving_ordered_hash_to_hashXavier Noria2012-02-091-5/+5
|\ \ \ | |/ / |/| | moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ord...
| * | moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered oneKarunakar (Ruby)2012-02-091-5/+5
|/ /
* | Merge pull request #4959 from ram123naresh/removed_ordered_hashVijay Dev2012-02-091-2/+1
|\ \ | |/ |/| Replaced OrderedHash with Hash for ruby 1.9 series
| * Replaced OrderedHash with Hash for ruby 1.9 seriesUddhava2012-02-091-2/+1
| |
* | Merge pull request #4957 from ganeshkumar/order_hash_changeXavier Noria2012-02-091-3/+2
|\ \ | | | | | | replacing the orderhash with hash for ruby-1.9
| * | replacing the orderhash with hash for ruby-1.9ganesh2012-02-091-3/+2
| |/
* | Merge pull request #4958 from ganeshkumar/order_hash_requireXavier Noria2012-02-091-1/+0
|\ \ | |/ |/| removed unnecessary code
| * removed unnecessary codeganesh2012-02-091-1/+0
|/
* Merge pull request #4950 from ask4prasath/text_changesVijay Dev2012-02-081-1/+1
|\ | | | | Test title changed corresponding to the test
| * test title changed corresponding to the testprasath2012-02-091-1/+1
|/
* Merge pull request #4949 from ↵Xavier Noria2012-02-081-3/+1
|\ | | | | | | | | ask4prasath/ordered_hash_replacement_activeresource replaced active support ordered hash to ruby hash on active resource
| * replaced active support ordered hash to ruby hash on active resourceprasath2012-02-091-3/+1
|/
* Merge pull request #4947 from rafaelfranca/fix-buildAaron Patterson2012-02-081-3/+7
|\ | | | | PostgreSQL does not work in the same way of the other adapters
| * PostgreSQL does not work in the same way of the other adaptersRafael Mendonça França2012-02-081-3/+7
|/
* 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 02:26:45 +0000