aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make current_url? work with a HEAD methodMichiel Sikkes2013-01-282-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::CachingMichiel Sikkes2013-01-281-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 docXavier Noria2013-01-281-2/+2
|
* explains why the query cache checks arel.lockedXavier Noria2013-01-281-0/+2
|
* Merge pull request #9032 from firmhouse/head-breaks-csrfSantiago Pastorino2013-01-282-2/+6
|\ | | | | Make HEAD work / convert to GET once more
| * Added request.head? to forgery protection codeMichiel Sikkes2013-01-221-2/+2
| |
| * Added a test that shows that a HEAD request does not normally pass CSRF ↵Michiel Sikkes2013-01-221-0/+4
| | | | | | | | protection
* | Use Encoding::UTF_8 constant :do_not_litter:Akira Matsuda2013-01-2810-15/+15
| |
* | Use already defined Encoding constants rather than creating one-trip StringsAkira Matsuda2013-01-283-3/+3
| |
* | add fetch to CookieJarAaron Patterson2013-01-272-0/+34
| |
* | Prevent Relation#merge from collapsing wheres on the RHSJon Leighton2013-01-279-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 Silva2013-01-271-1/+1
| |
* | Fix cases where delete_records on a has_many association caused errorsDerek Kraan2013-01-277-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-checksJosé Valim2013-01-261-1/+1
|\ \ | | | | | | Use `silence` instead of `quietly` to silence the `CheckPending` middleware.
| * | Use `silence` instead of `quietly` to silence the `CheckPending` middleware.Lucas Mazza2013-01-261-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 attributesAndrew White2013-01-261-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 attributesLilibeth De La Cruz2013-01-263-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 Noria2013-01-2626-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 docrailsXavier Noria2013-01-265-423/+63
| | |
| * | Remove mass-assignment line from guide summaryAndrew Wilcox2013-01-251-1/+0
| | |
| * | :scissors: "raise" duplicationAkira Matsuda2013-01-261-2/+1
| | |
| * | fix Active Record/Action Pack Changelog linksJuanjo Bazán2013-01-251-2/+2
| | |
| * | [engines guide] reformatted some stuffWeston Platter2013-01-241-3/+3
| | |
| * | [engines guide] reworded a run onWeston Platter2013-01-241-3/+2
| | |
| * | Add new DB rake tasks to the contributing section.Vipul A M2013-01-231-0/+14
| | |
| * | Made indentation consistent.Philip Arndt2013-01-231-1/+1
| | |
| * | Typo, grammar, and comma love.Brian Littmann2013-01-221-4/+4
| | |
| * | Typo fix in guides/source/engines.mdBrian Littmann2013-01-221-1/+1
| | |
| * | Fix typoTatsuro Baba2013-01-221-1/+1
| | |
| * | adding comma to separate clausesvertigoclinic2013-01-211-1/+1
| | |
| * | Review #translate docs [ci skip]Carlos Antonio da Silva2013-01-201-8/+7
| | |
| * | Add documentation for abstract controller #translate and #localize method.Jens Bissinger2013-01-201-0/+10
| | |
| * | Add documentation to ActionDispatch::ResponseMatthew Stopa2013-01-201-0/+7
| | |
| * | consistently inherit from ApplicationController in guides exemplesCyril Jouve2013-01-203-4/+4
| | |
| * | Replacing plugin to gemLucas Caton2013-01-191-2/+2
| | |
| * | Replaced documentation for ↵Thomas Drake-Brockman2013-01-201-1/+1
| | | | | | | | | | | | config.action_controller.raise_on_unpermitted_parameters with documentation for config.action_controller.action_on_unpermitted_params.
| * | fix broken examples format in image_tag helper [ci skip]Francesco Rodriguez2013-01-181-0/+2
| | |
| * | "Asynchronous Mailers" will not be available in 4.0Akira Matsuda2013-01-181-1/+0
| | |
| * | Remove useless number signTatsuro Baba2013-01-181-2/+2
| | | | | | | | | | | | I think that these signs are probably mistake.
| * | for recommended Apache configuration of asset pipeline, use <Location> ↵Erik Johnson2013-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | instead of <LocationMatch>, to avoid unnecessary reg ex parsing and code <http://httpd.apache.org/docs/2.2/mod/core.html#location (recommended by @jja). - @erikj
| * | repeating documentation for option form helpersThiago Pinto2013-01-171-0/+286
| | |
| * | repeating documentation for date and time form helpersThiago Pinto2013-01-171-0/+148
| | |
| * | fix example of setting DEFAULTS in fixturesJonathan Garvin2013-01-161-2/+2
| | |
| * | clarify awkward sentence re: email testingJonathan Garvin2013-01-161-1/+1
| | |
| * | Fix typo introduced in 0004ca3aCarlos Antonio da Silva2013-01-161-1/+1
| | | | | | | | | | | | [ci skip]
| * | Fix formatting error introduced in cc585c8.Nicholas Schultz-Møller2013-01-161-1/+2
| | |
| * | More documentation for ActionDispatch::ResponseMatthew Stopa2013-01-161-1/+3
| | | | | | | | | | | | [ci skip]
| * | Document ActionDispatch::Response#body methodMatthew Stopa2013-01-161-0/+1
| | |
| * | removes spurious file pushed in cc585c8Xavier Noria2013-01-151-349/+0
| | |
| * | revert to 814c9875ec4cf01e1348d1ab1c9d12eee5a9adacdavetoxa2013-01-162-0/+393
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 21:20:07 +0000