Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Raise a specific exception with a useful message if a rake task is requested ↵ | Daniel Azuma | 2013-01-30 | 2 | -0/+10 |
| | | | | for an unknown adapter | ||||
* | reloading type map on extension changing | Aaron Patterson | 2013-01-29 | 2 | -2/+15 |
| | |||||
* | fixing comment | Aaron Patterson | 2013-01-29 | 1 | -1/+1 |
| | |||||
* | Changelog about BestStandardsSupport removal | Guillermo Iguaran | 2013-01-29 | 1 | -5/+6 |
| | |||||
* | Add 'X-UA-Compatible' => 'chrome=1' to default headers | Guillermo Iguaran | 2013-01-29 | 2 | -2/+5 |
| | |||||
* | Remove BestStandardsSupport middleware | Guillermo Iguaran | 2013-01-29 | 9 | -108/+3 |
| | |||||
* | Fix typo | Rafael Mendonça França | 2013-01-29 | 1 | -1/+1 |
| | |||||
* | Only search for enabled extension if the PostgreSQL version supports | Rafael Mendonça França | 2013-01-29 | 1 | -3/+5 |
| | | | | extensions | ||||
* | 'minitest/parallel_each' might not always be available | Akira Matsuda + Koichi Sasada | 2013-01-29 | 1 | -1/+4 |
| | |||||
* | Merge pull request #9104 from bemurphy/remove_bad_idea_parser_test | Carlos Antonio da Silva | 2013-01-29 | 1 | -13/+0 |
|\ | | | | | Remove yaml Proc param parser test | ||||
| * | Remove yaml Proc param parser test | Brendon Murphy | 2013-01-28 | 1 | -13/+0 |
| | | | | | | | | | | | | | | | | I don't believe this test is exercising any explicit params_parser behavior that the other two Proc tests aren't already doing. Given that we now know it's a bad idea to load user input via YAML.load, somebody reading this test might get a dangerous idea about building out a YAML params parser. | ||||
* | | Needs to explicitly require 'minitest/parallel_each' | Akira Matsuda + Koichi Sasada | 2013-01-29 | 1 | -0/+2 |
| | | | | | | | | Minitest has changed to require this since https://github.com/seattlerb/minitest/commit/728054b | ||||
* | | s/ERb/ERB/ | Akira Matsuda | 2013-01-29 | 1 | -1/+1 |
|/ | |||||
* | Send paths argument as an array rather than converting it internally | Carlos Antonio da Silva | 2013-01-28 | 1 | -3/+3 |
| | |||||
* | Refactor to use each_key, remove extra spaces | Carlos Antonio da Silva | 2013-01-28 | 7 | -11/+5 |
| | |||||
* | add API to pg for enabling / disabling hstore | Aaron Patterson | 2013-01-28 | 3 | -7/+54 |
| | |||||
* | Merge pull request #9096 from tricknotes/fix-code-comment | Rafael Mendonça França | 2013-01-28 | 1 | -4/+4 |
|\ | | | | | Fix code comment | ||||
| * | Fix JavaScript syntax in code comment [ci skip] | Ryunosuke SATO | 2013-01-29 | 1 | -4/+4 |
| | | |||||
* | | revamps the RDoc of Object#try | Xavier Noria | 2013-01-28 | 1 | -22/+30 |
| | | |||||
* | | Move AS changelog entry to the top, improve AP changelog a bit | Carlos Antonio da Silva | 2013-01-28 | 2 | -6/+6 |
| | | | | | | | | [ci skip] | ||||
* | | no need for \Z, \z is more concise | Xavier Noria | 2013-01-28 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #8830 from antoinelyset/master | Xavier Noria | 2013-01-28 | 4 | -5/+13 |
|\ \ | | | | | | | Improve String#squish whitespaces matching | ||||
| * | | Improve String#squish whitespaces matching | Antoine Lyset | 2013-01-22 | 4 | -5/+13 |
| | | | |||||
* | | | Merge pull request #9098 from firmhouse/add-head-requests | Rafael Mendonça França | 2013-01-28 | 4 | -5/+12 |
|\ \ \ | | | | | | | | | Make current_url? work with HEAD requests and remove caching_allowed? since it doesn't do anything | ||||
| * | | | Added a Changelog entry for fixing HEAD requests. | Michiel Sikkes | 2013-01-28 | 1 | -0/+5 |
| | | | | |||||
| * | | | Make current_url? work with a HEAD method | Michiel Sikkes | 2013-01-28 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Head was removed in favor of Rack::Head. But Rack::Head does not convert GET requests to HEAD requests so we need to do checking for HEAD requests ourselves. | ||||
| * | | | Remove caching_allowed? from ActionController::Caching | Michiel Sikkes | 2013-01-28 | 1 | -4/+0 |
|/ / / | | | | | | | | | | | | | Where is this used? No other code references to this method and it isn't being tested anywhere. No tests fail when commented out. | ||||
* | | | updates a dynamic method heredoc doc | Xavier Noria | 2013-01-28 | 1 | -2/+2 |
| | | | |||||
* | | | explains why the query cache checks arel.locked | Xavier Noria | 2013-01-28 | 1 | -0/+2 |
| |/ |/| | |||||
* | | Merge pull request #9032 from firmhouse/head-breaks-csrf | Santiago Pastorino | 2013-01-28 | 2 | -2/+6 |
|\ \ | | | | | | | Make HEAD work / convert to GET once more | ||||
| * | | Added request.head? to forgery protection code | Michiel Sikkes | 2013-01-22 | 1 | -2/+2 |
| | | | |||||
| * | | Added a test that shows that a HEAD request does not normally pass CSRF ↵ | Michiel Sikkes | 2013-01-22 | 1 | -0/+4 |
| | | | | | | | | | | | | protection | ||||
* | | | Use Encoding::UTF_8 constant :do_not_litter: | Akira Matsuda | 2013-01-28 | 10 | -15/+15 |
| | | | |||||
* | | | Use already defined Encoding constants rather than creating one-trip Strings | Akira Matsuda | 2013-01-28 | 3 | -3/+3 |
| | | | |||||
* | | | add fetch to CookieJar | Aaron Patterson | 2013-01-27 | 2 | -0/+34 |
| | | | |||||
* | | | Prevent Relation#merge from collapsing wheres on the RHS | Jon Leighton | 2013-01-27 | 9 | -22/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused a bug with the new associations implementation, because now association conditions are represented as Arel nodes internally right up to when the whole thing gets turned to SQL. In Rails 3.2, association conditions get turned to raw SQL early on, which prevents Relation#merge from interfering. The current implementation was buggy when a default_scope existed on the target model, since we would basically end up doing: default_scope.merge(association_scope) If default_scope contained a where(foo: 'a') and association_scope contained a where(foo: 'b').where(foo: 'c') then the merger would see that the same column is representated on both sides of the merge and collapse the wheres to all but the last: where(foo: 'c') Now, the RHS of the merge is left alone. Fixes #8990 | ||||
* | | | Fix typo: adaptors => adapters [ci skip] | Carlos Antonio da Silva | 2013-01-27 | 1 | -1/+1 |
| | | | |||||
* | | | Fix cases where delete_records on a has_many association caused errors | Derek Kraan | 2013-01-27 | 7 | -5/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because of an ambiguous column name. This happened if the association model had a default scope that referenced a third table, and the third table also referenced the original table (with an identical foreign_key). Mysql requires that ambiguous columns are deambiguated by using the full table.column syntax. Postgresql and Sqlite use a different syntax for updates altogether (and don't tolerate table.name syntax), so the fix requires always including the full table.column and discarding it later for Sqlite and Postgresql. | ||||
* | | | Merge pull request #9087 from lucasmazza/silence-migration-checks | José Valim | 2013-01-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use `silence` instead of `quietly` to silence the `CheckPending` middleware. | ||||
| * | | | Use `silence` instead of `quietly` to silence the `CheckPending` middleware. | Lucas Mazza | 2013-01-26 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | `Kernel.quietly` silences `STDOUT` and `STDERR`, which is useless if the logger is writing to a file, while `AS::Logger#silence` swaps the logger level to `ERROR`. Related to #8820 and #8052. | ||||
* | | | Simplify type casting code for timezone aware attributes | Andrew White | 2013-01-26 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | | | With the addition of String#in_time_zone and Date#in_time_zone we can simplify the type casting code by checking if the value has an `in_time_zone` method. | ||||
* | | | Fix handling of dirty time zone aware attributes | Lilibeth De La Cruz | 2013-01-26 | 3 | -2/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when `time_zone_aware_attributes` were enabled, after changing a datetime or timestamp attribute and then changing it back to the original value, `changed_attributes` still tracked the attribute as changed. This caused `[attribute]_changed?` and `changed?` methods to return true incorrectly. Example: in_time_zone 'Paris' do order = Order.new original_time = Time.local(2012, 10, 10) order.shipped_at = original_time order.save order.changed? # => false # changing value order.shipped_at = Time.local(2013, 1, 1) order.changed? # => true # reverting to original value order.shipped_at = original_time order.changed? # => false, used to return true end | ||||
* | | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-01-26 | 26 | -49/+198 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb guides/code/getting_started/app/controllers/comments_controller.rb | ||||
| * | | | generic pass before merging docrails | Xavier Noria | 2013-01-26 | 5 | -423/+63 |
| | | | | |||||
| * | | | Remove mass-assignment line from guide summary | Andrew Wilcox | 2013-01-25 | 1 | -1/+0 |
| | | | | |||||
| * | | | :scissors: "raise" duplication | Akira Matsuda | 2013-01-26 | 1 | -2/+1 |
| | | | | |||||
| * | | | fix Active Record/Action Pack Changelog links | Juanjo Bazán | 2013-01-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | [engines guide] reformatted some stuff | Weston Platter | 2013-01-24 | 1 | -3/+3 |
| | | | | |||||
| * | | | [engines guide] reworded a run on | Weston Platter | 2013-01-24 | 1 | -3/+2 |
| | | | | |||||
| * | | | Add new DB rake tasks to the contributing section. | Vipul A M | 2013-01-23 | 1 | -0/+14 |
| | | | |