aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Introduce `render :body` for render raw contentPrem Sichanugrist2014-02-1810-11/+219
| | | | | | | | | | | | This is an option for sending a raw content back to browser. Note that this rendering option will unset the default content type and does not include "Content-Type" header back in the response. You should only use this option if you are expecting the "Content-Type" header to not be set. More information on "Content-Type" header can be found on RFC 2616, section 7.2.1. Please see #12374 for more detail.
* Merge pull request #14095 from rails/rm-scopesRafael Mendonça França2014-02-184-12/+146
|\ | | | | Document `default_scope` changes
| * Don't use `# =>` when it is not the expression valuesRafael Mendonça França2014-02-183-26/+26
| | | | | | | | [ci skip]
| * Fix the column name [ci skip]Rafael Mendonça França2014-02-183-14/+14
| |
| * Document the default scopes change on the release notes, CHANGELOGRafael Mendonça França2014-02-183-0/+134
| | | | | | | | | | | | and upgrating guides [ci skip]
| * Aesthetic [ci skip]Rafael Mendonça França2014-02-181-4/+4
| |
| * Tell default_scope are prepended [ci skip]Rafael Mendonça França2014-02-181-1/+1
| |
| * Updated doc for default scope [ci skip]Rashmi Yadav2014-02-181-4/+4
| |
* | Merge pull request #14094 from kalabiyau/fix_parameters_namingCarlos Antonio da Silva2014-02-181-2/+2
|\ \ | | | | | | Fix parameter naming in RemoteIp middleware constructor method [ci skip]
| * | Fix parameter naming in RemoteIp middleware constructor methodKalabiYau2014-02-181-2/+2
| |/ | | | | | | | | Was custom_proxies in inline docs, but should be and defined in constructor as custom_proxies
* | Move changelog entry to the top, fix examples indent [ci skip]Carlos Antonio da Silva2014-02-181-10/+10
| |
* | Minor grammar/punctuation fixes [ci skip]Carlos Antonio da Silva2014-02-181-4/+3
| |
* | Use assert_nil instead as its clearer about what the return is expected to beDavid Heinemeier Hansson2014-02-181-1/+1
| |
* | Merge pull request #14096 from arthurnn/precompile_allGuillermo Iguaran2014-02-181-1/+1
|\ \ | | | | | | Upgrade Doc: assets:precompile:all was removed on 4
| * | Doc: assets:precompile:all was removed on 4 [skip ci]Arthur Neves2014-02-181-1/+1
| |/
* / Added Object#present_in to simplify value whitelistingDavid Heinemeier Hansson2014-02-183-0/+29
|/
* travel_to travels back and re-raises if the block raisesXavier Noria2014-02-182-3/+18
|
* adds a missing travel backXavier Noria2014-02-181-4/+4
|
* time helpers honor the application time zone when passed a dateXavier Noria2014-02-183-4/+37
| | | | | | | | | | | | | | | | | Rails applications are expected to be always aware of the application time zone. To be consistent with that contract, we have to assume that a bare date passed to time helpers is a date in the application time zone, not in the system time zone. The system time zone is irrelevant, we should totally ignore it. For example, travel_to user.birth_date + 40.years should make that user be 40th years old regardless of the system time zone. Without this patch that may not be true.
* Merge pull request #14000 from Fortisque/kevin/stream_error_managementAaron Patterson2014-02-173-0/+27
|\ | | | | streaming should change status of response when exception is caught
| * Correct prestreaming controller response status.Kevin Casey2014-02-153-0/+27
| | | | | | | | | | | | if the controller action has not yet streamed any data, actions should process as normal, and errors should trigger the appropriate behavior (500, or in the case of ActionController::BadRequest, a 400 Bad Request)
* | Merge pull request #14087 from 10io/patch-1Carlos Antonio da Silva2014-02-171-1/+1
|\ \ | | | | | | Fix coffeescript sample [ci skip]
| * | Fix coffeescript sample [ci skip]David Fernandez2014-02-131-1/+1
| | | | | | | | | Replace bind() with on() as suggested by the JQuery bind() documentation: https://api.jquery.com/bind/
* | | Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"Rafael Mendonça França2014-02-173-21/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3ea840355409dc205a9e0d027fc09f1452636969, reversing changes made to e4cde5d58cbb09d1843796f96ba86225ff94fe05. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/query_methods.rb Reason: using `from` without `select` should not change the select list to SELECT * because it can lead different query results. If it is needed to change the table to a subquery or a view you can pass a table alias in the `from` call or use `select('subquery.*')`. Fixes #14049.
* | | No need to use symbolsRafael Mendonça França2014-02-161-3/+3
| | |
* | | Don't skip tests if they are not broken. Just don't define theyRafael Mendonça França2014-02-162-9/+5
| | |
* | | Fix typo [ci skip]Rafael Mendonça França2014-02-162-2/+2
| | |
* | | Merge pull request #13512 from gsamokovarov/hstore_arrays_fixGuillermo Iguaran2014-02-164-7/+52
|\ \ \ | | | | | | | | Hstore arrays fix (follow up for #11444)
| * | | Resolve encoding issues with arrays of hstore (bug 11135).Josh Goodall2014-02-174-7/+52
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We didn't have enough encoding for the wire protocol to store an array of hstore types. So, further encode any hstore that is an array member. Whilst we're here, ensure it's an HashWithIndifferentAccess being returned, to be consistent with other serialized forms, and add testing for arrays of hstore. So now the following migration: enable_extension "hstore" create_table :servers do |t| t.string :name t.hstore :interfaces, array: true end produces a model that can used like this, to store an array of hashes: server = Server.create(name: "server01", interfaces: [ { name: "bge0", ipv4: "192.0.2.2", state: "up" }, { name: "de0", state: "disabled", by: "misha" }, { name: "fe0", state: "up" }, ]) More at http://inopinatus.org/2013/07/12/using-arrays-of-hstore-with-rails-4/
* | | Merge pull request #13937 from ktaragorn/guides_fixesVijay Dev2014-02-162-3/+14
|\ \ \ | | | | | | | | Guides fixes
| * | | Getting started guide fixes & Explain X-SendFile a little better, with linksKarthik T2014-02-142-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain how form_for :article is able to pull in the properties of @article Make it clear that article_id is generated due to the association set up Add link to the rails function that uses X-Sendfile. Add links to apache and nginx docs for the header
* | | | Merge pull request #14072 from robin850/patch-16Rafael Mendonça França2014-02-151-0/+7
|\ \ \ \ | |_|_|/ |/| | | Add a missing changelog entry for #13981 and #14035
| * | | Add a missing changelog entry for #13981 and #14035Robin Dupret2014-02-151-0/+7
|/ / / | | | | | | | | | [ci skip]
* | | Merge pull request #14069 from arunagw/aa-plugin-generator-build-fixCarlos Antonio da Silva2014-02-151-4/+1
|\ \ \ | | | | | | | | | | | | | | | | Revert "Fixed plugin_generator test" As this commit 22a1a5ac8c4631f29cfeac451c361e8da1dd2261 has reverted all changes so this plugin generator also needs to fix.
| * | | Revert "Fixed plugin_generator test"Arun Agrawal2014-02-151-4/+1
|/ / / | | | | | | | | | This reverts commit fefa8ae9a172835fb6b8aef7d1dd46d58eecd49f.
* | | implements new option :month_format_string for date select helpers [Closes ↵Xavier Noria2014-02-153-9/+48
| | | | | | | | | | | | #13618]
* | | add factory methods for empty alias trackersAaron Patterson2014-02-143-23/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we know the alias tracker is empty, we can create one that doesn't use a hash with default block for counting. ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') ActiveRecord::Schema.define do create_table :posts, force: true do |t| t.integer :comments_count end create_table :comments, force: true do |t| t.integer :post_id end end class Post < ActiveRecord::Base; has_many :comments; end class Comment < ActiveRecord::Base; belongs_to :post, counter_cache: true; end 10.times { Comment.create!(post: Post.create!) } record = Post.first association_name = :comments Benchmark.ips do |x| reflection = record.class.reflect_on_association(association_name) association = reflection.association_class.new(record, reflection) x.report('assoc') do reflection.association_class.new(record, reflection) end x.report('reader') do association.reader;nil end x.report('combined') do reflection.association_class.new(record, reflection).reader;nil end end [aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb -- create_table(:posts, {:force=>true}) -> 0.0062s -- create_table(:comments, {:force=>true}) -> 0.0003s Calculating ------------------------------------- assoc 833 i/100ms reader 28703 i/100ms combined 839 i/100ms ------------------------------------------------- assoc 9010.3 (±3.8%) i/s - 44982 in 5.000022s reader 3214523.4 (±5.5%) i/s - 16016274 in 5.001136s combined 8841.0 (±5.8%) i/s - 44467 in 5.049269s [aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb -- create_table(:posts, {:force=>true}) -> 0.0060s -- create_table(:comments, {:force=>true}) -> 0.0003s Calculating ------------------------------------- assoc 888 i/100ms reader 29217 i/100ms combined 900 i/100ms ------------------------------------------------- assoc 9674.3 (±3.3%) i/s - 48840 in 5.054022s reader 2988474.8 (±6.9%) i/s - 14842236 in 4.998230s combined 9674.0 (±3.1%) i/s - 48600 in 5.028694s
* | | guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-143-6/+12
| | |
* | | stop exposing table_joinsAaron Patterson2014-02-141-4/+3
| | |
* | | make most parameters to the AliasTracker requiredAaron Patterson2014-02-142-6/+4
| | | | | | | | | | | | | | | This helps with our sanity. The class is internal, we can refactor to a "nice" API later.
* | | make a singleton for AssociationScopeAaron Patterson2014-02-143-3/+8
| | | | | | | | | | | | | | | AssociationScope no longer maintains state, so we're safe to keep a singleton and save on GC time
* | | pass the association and connection to the scope methodAaron Patterson2014-02-143-11/+7
| | |
* | | pass the tracker down the stack and construct it in the scope methodAaron Patterson2014-02-141-18/+18
| | |
* | | clean up add_constraints signatureAaron Patterson2014-02-141-8/+9
| | |
* | | remove the reflection delegateAaron Patterson2014-02-141-15/+14
| | |
* | | remove klass delegatorAaron Patterson2014-02-141-10/+11
| | |
* | | remove railties changes. fixes #14054Aaron Patterson2014-02-146-191/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 96991e8e919edfb20cc4120bca4e36ed51175d57 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:29:24 2014 -0800 Revert "gems can be added or skipped from the template" This reverts commit 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356. Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb railties/test/generators/app_generator_test.rb commit 35599c0e657245ef14ac0f28c9189ad16acf40e6 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:26:53 2014 -0800 Revert "oops, template replay needs to happen after bundle. :orz:" This reverts commit 9104702be61253f9448ca070a22fc86bb4299555. Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb commit f519c3902c313db8e906a49251c91643b8e6499e Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:51 2014 -0800 Revert "only ask for these ivars if the target responds to them" This reverts commit 656d412546cd97d5660c634c2a41c799d3f9e211. commit aa524a9428e3e4c45fe221f10a66a08efb827ab5 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:39 2014 -0800 Revert "refactor generator tests to use block form of Tempfile" This reverts commit 65251820ef0ab7f3cffb38130de3dd41af8d72be. commit 7d3740549fa4dfa62e3761f8d4bc6d6d441256e7 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:25 2014 -0800 Revert "add a more restricted codepath for templates fixes #13390" This reverts commit 2875b4a66e38e4333da887a4afbed33358999298. commit 525df0af1001918986cdfce59539fd2d52c4f32c Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri Feb 14 11:25:11 2014 -0800 Revert "add a send so `apply` can be called. Fixes #13510" This reverts commit c5034d60dba0cd31a6a8c612ee35d63b8127793a.
* | | remove chain delegateAaron Patterson2014-02-141-5/+6
| | |
* | | remove scope_chain delegateAaron Patterson2014-02-141-3/+3
| | |
* | | Merge pull request #14061 from davejachimiak/add_verb_in_guidesRafael Mendonça França2014-02-141-1/+1
|\ \ \ | | | | | | | | Add verb to sanitization note
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 12:39:19 +0000