Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | make new rails apps log to STDOUT | Terence Lee | 2013-03-15 | 6 | -5/+47 | |
| | | | | | ||||||
* | | | | | Merge pull request #9733 from ↵ | Jon Leighton | 2013-03-15 | 4 | -2/+38 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | senny/9712_option_to_turn_references_deprecation_off make it possible to disable implicit join references. | |||||
| * | | | | | make it possible to disable implicit join references. | Yves Senn | 2013-03-15 | 4 | -2/+38 | |
| | |_|/ / | |/| | | | | | | | | | | | | | Closes #9712. | |||||
* / | | | | Cache the association proxy object | Jon Leighton | 2013-03-15 | 2 | -1/+6 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reimplements the behaviour of Rails 3, as I couldn't see why we shouldn't cache the object, and @alindeman had a good use case for caching it: https://github.com/rails/rails/commit/c86a32d7451c5d901620ac58630460915292f88b#commitcomment-2784312 | |||||
* | | | | Merge pull request #9683 from senny/deprecate_count_distinct_option | Jon Leighton | 2013-03-15 | 24 | -59/+129 | |
|\ \ \ \ | | | | | | | | | | | rename `Relation#uniq` to `Relation#distinct` | |||||
| * | | | | Deprecate the `:distinct` option for `Relation#count`. | Yves Senn | 2013-03-15 | 8 | -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 Senn | 2013-03-15 | 22 | -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_typos | Carlos Antonio da Silva | 2013-03-15 | 4 | -5/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | Small typos here and there. | |||||
| * | | | | | Small typos here and there. | Vipul A M | 2013-03-15 | 4 | -5/+5 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9686 from strzalek/cast_number_to_string_in_pg | Jon Leighton | 2013-03-15 | 2 | -3/+14 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Cast number to string in Postgres | |||||
| * | | | | | | Cast number to string in Postgres | Łukasz Strzałkowski | 2013-03-12 | 2 | -3/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #9170 | |||||
* | | | | | | | Merge pull request #9732 from arunagw/warning_fix_unused_variable | Andrew White | 2013-03-15 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Warning removed unused variable task_name | |||||
| * | | | | | | Warning removed unused variable task_name | Arun Agrawal | 2013-03-15 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: assigned but unused variable - task_name | |||||
* | | | | | | | Fix typos and improve docs a bit [ci skip] | Carlos Antonio da Silva | 2013-03-15 | 1 | -7/+5 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #9731 from senny/9724_argument_error_on_reset_counters | Andrew White | 2013-03-15 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | `#reset_counters` verifies counter names. | |||||
| * | | | | | `#reset_counters` verifies counter names. | Yves Senn | 2013-03-15 | 2 | -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_tests | Andrew White | 2013-03-15 | 7 | -19/+90 | |
|\ \ \ \ \ | | | | | | | | | | | | | Rework headers functional tests | |||||
| * | | | | | document request simulation methods in functional tests. | Yves Senn | 2013-03-15 | 1 | -7/+27 | |
| | | | | | | ||||||
| * | | | | | `Http::Headers` directly modifies the passed environment. | Yves Senn | 2013-03-15 | 6 | -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 pk | Aaron Patterson | 2013-03-14 | 1 | -1/+5 | |
| | | | | | ||||||
* | | | | | fix hash duping on 1.9 | Aaron Patterson | 2013-03-14 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | clean up pk delclaration in `create_table` | Aaron Patterson | 2013-03-14 | 1 | -1/+8 | |
| | | | | | ||||||
* | | | | | bumping arel | Aaron Patterson | 2013-03-14 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | oops! | Aaron Patterson | 2013-03-14 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | just access the ivars rather than rb_iv_get | Aaron Patterson | 2013-03-14 | 1 | -5/+3 | |
| | | | | | ||||||
* | | | | | hide more data in the schema cache | Aaron Patterson | 2013-03-14 | 5 | -17/+35 | |
| | | | | | ||||||
* | | | | | safely publish columns and columns hash info | Aaron Patterson | 2013-03-14 | 4 | -15/+23 | |
| | | | | | ||||||
* | | | | | Getting Started Guide: 3.2.9 -> 4.0.0. [ci skip] | Steve Klabnik | 2013-03-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Brought up in https://github.com/rails/rails/issues/9727 | |||||
* | | | | | dup and set the default proc to nil rather than looping through everything | Aaron Patterson | 2013-03-14 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | you can provide uuid_generate_v4 as the default value for uuid columns | Aaron Patterson | 2013-03-14 | 3 | -2/+52 | |
| |_|/ / |/| | | | ||||||
* | | | | pg is the only adapter that supports the xml type, so push the method down | Aaron Patterson | 2013-03-14 | 2 | -9/+4 | |
| | | | | ||||||
* | | | | Apparently people were mutating this array. :'( | Aaron Patterson | 2013-03-14 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | This reverts commit abba61e2bbe320894ba8449ebdf778a1d2af545b. | |||||
* | | | | hashes are ordered, so just use the columns_hash ivar | Aaron Patterson | 2013-03-14 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | use the method so we do not depend on internal ivars | Aaron Patterson | 2013-03-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | extract factory method and push common code up to abstract adapter | Aaron Patterson | 2013-03-14 | 2 | -7/+7 | |
| | | | | ||||||
* | | | | Merge pull request #9713 from imanel/live_stale | Aaron Patterson | 2013-03-14 | 2 | -0/+19 | |
|\ \ \ \ | |_|/ / |/| | | | Handle conditional get in live requests | |||||
| * | | | Handle conditional get in live requests - this will prevent error when using ↵ | Bernard Potocki | 2013-03-14 | 2 | -0/+19 | |
|/ / / | | | | | | | | | | stale on live streams(issue #9636) | |||||
* | | | Merge pull request #9711 from vipulnsward/moar_cleanups | Steve Klabnik | 2013-03-13 | 4 | -6/+5 | |
|\ \ \ | | | | | | | | | MOAR cleanups of unused variables. | |||||
| * | | | MOAR cleanups. | Vipul A M | 2013-03-14 | 4 | -6/+5 | |
|/ / / | ||||||
* | | | Add extra clarifying line in docs. [ci skip] | Steve Klabnik | 2013-03-13 | 1 | -0/+1 | |
| | | | ||||||
* | | | Fix docs: response -> request. | Steve Klabnik | 2013-03-13 | 1 | -2/+2 | |
| | | | | | | | | | | | | Even though I read it carefully, my brain tricked me. :cry: | |||||
* | | | Merge pull request #9698 from garethrees/request_documentation | Steve Klabnik | 2013-03-13 | 1 | -0/+16 | |
|\ \ \ | | | | | | | | | Add documentation to ActionDispatch::Request | |||||
| * | | | Add documentation to ActionDispatch::Request | Gareth Rees | 2013-03-13 | 1 | -0/+16 | |
| | | | | ||||||
* | | | | Merge pull request #9690 from trevorturk/upgrade-notes | Rafael Mendonça França | 2013-03-13 | 1 | -0/+26 | |
|\ \ \ \ | | | | | | | | | | | Rails 4 upgrade notes about clashing named route selection changes | |||||
| * | | | | Document change to clashing named route selection from journey commit 98a9802a | Trevor Turk | 2013-03-12 | 1 | -0/+26 | |
| | | | | | ||||||
* | | | | | Merge pull request #9699 from rubys/scaffold_password_digest | Carlos Antonio da Silva | 2013-03-13 | 11 | -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:digest | Sam Ruby | 2013-03-13 | 11 | -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 Silva | 2013-03-13 | 1 | -20/+21 | |
| | | | | | ||||||
* | | | | | Merge pull request #9700 from senny/6513_integration_test_headers | Andrew White | 2013-03-13 | 5 | -65/+206 | |
|\ \ \ \ \ | | | | | | | | | | | | | rework passing headers and env variables in integration tests | |||||
| * | | | | | `Http::Headers` respects dotted env vars, symbols, headers with numbers. | Yves Senn | 2013-03-13 | 2 | -11/+33 | |
| | | | | | |