aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9683 from senny/deprecate_count_distinct_optionJon Leighton2013-03-1524-59/+129
|\ | | | | rename `Relation#uniq` to `Relation#distinct`
| * Deprecate the `:distinct` option for `Relation#count`.Yves Senn2013-03-158-15/+44
| | | | | | | | | | | | | | We moved more and more away from passing options to finder / calculation methods. The `:distinct` option in `#count` was one of the remaining places. Since we can now combine `Relation#distinct` with `Relation#count` the option is no longer necessary and can be deprecated.
| * rename `Relation#uniq` to `Relation#distinct`. `#uniq` still works.Yves Senn2013-03-1522-45/+86
| | | | | | | | | | | | | | | | The similarity of `Relation#uniq` to `Array#uniq` is confusing. Since our Relation API is close to SQL terms I renamed `#uniq` to `#distinct`. There is no deprecation. `#uniq` and `#uniq!` are aliases and will continue to work. I also updated the documentation to promote the use of `#distinct`.
* | Merge pull request #9728 from vipulnsward/fix_em_typosCarlos Antonio da Silva2013-03-154-5/+5
|\ \ | | | | | | Small typos here and there.
| * | Small typos here and there.Vipul A M2013-03-154-5/+5
| | |
* | | Merge pull request #9686 from strzalek/cast_number_to_string_in_pgJon Leighton2013-03-152-3/+14
|\ \ \ | | | | | | | | Cast number to string in Postgres
| * | | Cast number to string in PostgresŁukasz Strzałkowski2013-03-122-3/+14
| | | | | | | | | | | | | | | | fixes #9170
* | | | Merge pull request #9732 from arunagw/warning_fix_unused_variableAndrew White2013-03-151-1/+0
|\ \ \ \ | |_|_|/ |/| | | Warning removed unused variable task_name
| * | | Warning removed unused variable task_nameArun Agrawal2013-03-151-1/+0
| | | | | | | | | | | | | | | | warning: assigned but unused variable - task_name
* | | | Fix typos and improve docs a bit [ci skip]Carlos Antonio da Silva2013-03-151-7/+5
| | | |
* | | | Merge pull request #9731 from senny/9724_argument_error_on_reset_countersAndrew White2013-03-152-1/+9
|\ \ \ \ | |/ / / |/| | | `#reset_counters` verifies counter names.
| * | | `#reset_counters` verifies counter names.Yves Senn2013-03-152-1/+9
|/ / / | | | | | | | | | | | | | | | | | | Closes #9724. Raise an `ArgumentError` when the name of the counter does not match an association name.
* | | Merge pull request #9716 from senny/rework_headers_functional_testsAndrew White2013-03-157-19/+90
|\ \ \ | | | | | | | | Rework headers functional tests
| * | | document request simulation methods in functional tests.Yves Senn2013-03-151-7/+27
| | | |
| * | | `Http::Headers` directly modifies the passed environment.Yves Senn2013-03-156-12/+63
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The env hash passed to `Http::Headers#new` must be in env format. Also be aware that the passed hash is modified directly. docs and test-cases for setting headers/env in functional tests. Follow up to #9700.
* | | ask column if it is a pkAaron Patterson2013-03-141-1/+5
| | |
* | | fix hash duping on 1.9Aaron Patterson2013-03-141-1/+1
| | |
* | | clean up pk delclaration in `create_table`Aaron Patterson2013-03-141-1/+8
| | |
* | | bumping arelAaron Patterson2013-03-141-1/+1
| | |
* | | oops!Aaron Patterson2013-03-141-1/+0
| | |
* | | just access the ivars rather than rb_iv_getAaron Patterson2013-03-141-5/+3
| | |
* | | hide more data in the schema cacheAaron Patterson2013-03-145-17/+35
| | |
* | | safely publish columns and columns hash infoAaron Patterson2013-03-144-15/+23
| | |
* | | Getting Started Guide: 3.2.9 -> 4.0.0. [ci skip]Steve Klabnik2013-03-141-1/+1
| | | | | | | | | | | | Brought up in https://github.com/rails/rails/issues/9727
* | | dup and set the default proc to nil rather than looping through everythingAaron Patterson2013-03-141-1/+3
| | |
* | | you can provide uuid_generate_v4 as the default value for uuid columnsAaron Patterson2013-03-143-2/+52
| | |
* | | pg is the only adapter that supports the xml type, so push the method downAaron Patterson2013-03-142-9/+4
| | |
* | | Apparently people were mutating this array. :'(Aaron Patterson2013-03-141-3/+3
| | | | | | | | | | | | This reverts commit abba61e2bbe320894ba8449ebdf778a1d2af545b.
* | | hashes are ordered, so just use the columns_hash ivarAaron Patterson2013-03-141-3/+3
| | |
* | | use the method so we do not depend on internal ivarsAaron Patterson2013-03-141-1/+1
| | |
* | | extract factory method and push common code up to abstract adapterAaron Patterson2013-03-142-7/+7
| | |
* | | Merge pull request #9713 from imanel/live_staleAaron Patterson2013-03-142-0/+19
|\ \ \ | |_|/ |/| | Handle conditional get in live requests
| * | Handle conditional get in live requests - this will prevent error when using ↵Bernard Potocki2013-03-142-0/+19
|/ / | | | | | | stale on live streams(issue #9636)
* | Merge pull request #9711 from vipulnsward/moar_cleanupsSteve Klabnik2013-03-134-6/+5
|\ \ | | | | | | MOAR cleanups of unused variables.
| * | MOAR cleanups.Vipul A M2013-03-144-6/+5
|/ /
* | Add extra clarifying line in docs. [ci skip]Steve Klabnik2013-03-131-0/+1
| |
* | Fix docs: response -> request.Steve Klabnik2013-03-131-2/+2
| | | | | | | | Even though I read it carefully, my brain tricked me. :cry:
* | Merge pull request #9698 from garethrees/request_documentationSteve Klabnik2013-03-131-0/+16
|\ \ | | | | | | Add documentation to ActionDispatch::Request
| * | Add documentation to ActionDispatch::RequestGareth Rees2013-03-131-0/+16
| | |
* | | Merge pull request #9690 from trevorturk/upgrade-notesRafael Mendonça França2013-03-131-0/+26
|\ \ \ | | | | | | | | Rails 4 upgrade notes about clashing named route selection changes
| * | | Document change to clashing named route selection from journey commit 98a9802aTrevor Turk2013-03-121-0/+26
| | | |
* | | | Merge pull request #9699 from rubys/scaffold_password_digestCarlos Antonio da Silva2013-03-1311-14/+90
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for generate scaffold password:digest * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture
| * | | | Add support for generate scaffold password:digestSam Ruby2013-03-1311-14/+90
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password entirely from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture
* | | | Move some railties changelog entries to the top [ci skip]Carlos Antonio da Silva2013-03-131-20/+21
| | | |
* | | | Merge pull request #9700 from senny/6513_integration_test_headersAndrew White2013-03-135-65/+206
|\ \ \ \ | | | | | | | | | | rework passing headers and env variables in integration tests
| * | | | `Http::Headers` respects dotted env vars, symbols, headers with numbers.Yves Senn2013-03-132-11/+33
| | | | |
| * | | | allow headers and env to be passed in `IntegrationTest`.Yves Senn2013-03-135-36/+119
| | | | | | | | | | | | | | | | | | | | Closes #6513.
| * | | | refactor, `Http::Headers` stores headers in env notationYves Senn2013-03-132-29/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Also: cleanup, use consistent syntax for `Http::Header` and test.
| * | | | Http::Headers respects headers that are not prefixed with HTTP_Yves Senn2013-03-133-7/+30
|/ / / /
* | | | Merge pull request #9694 from ↵Carlos Antonio da Silva2013-03-131-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | vipulnsward/change_from_each_to_each_value_in_http_params Change from each to each_value in http/parameters since we don't use key