aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsVijay Dev2015-08-24456-4925/+7457
|\ | | | | | | | | Conflicts: guides/source/security.md
| * Merge pull request #21348 from yui-knk/fix/about_comma_style_2Vijay Dev2015-08-241-1/+1
| |\ | | | | | | [ci skip] Fix the grammar
| | * [ci skip] Fix the grammaryui-knk2015-08-241-1/+1
| |/ | | | | | | This is discussed on https://github.com/rails/rails/pull/21334
| * use methods on the request object instead of accessing envAaron Patterson2015-08-231-7/+7
| |
| * use `Request#path_info` instead of direct ENV accessAaron Patterson2015-08-231-1/+1
| | | | | | | | | | we already have a request, so we should use the methods on the request to access the path info information
| * remove env access from debug_exceptionsAaron Patterson2015-08-231-10/+9
| | | | | | | | Creates fewer request objects and helps to abstract away from internals
| * remove more `env` accessAaron Patterson2015-08-231-11/+19
| |
| * remove more env accessAaron Patterson2015-08-231-3/+3
| |
| * remove more env accessAaron Patterson2015-08-231-4/+6
| |
| * convert more `@env` access to get / set headerAaron Patterson2015-08-232-12/+14
| |
| * remove usage of `@env`Aaron Patterson2015-08-231-3/+5
| | | | | | | | | | try to remove dependencies on `@env` so we can have more flexible internals
| * Merge pull request #21341 from yui-knk/fix/ar_test_remove_innermethodYves Senn2015-08-231-5/+1
| |\ | | | | | | Remove test helper method to inside test method
| | * Remove test helper method to inside test methodyui-knk2015-08-231-5/+1
| | | | | | | | | | | | | | | | | | Remove `MigrationTest#connection` and write `ActiveRecord::Base.connection` directly to test, because `MigrationTest#connection` is only used in `test_migration_instance_has_connection`.
| * | Merge pull request #21340 from ronakjangir47/request_objectYves Senn2015-08-231-3/+3
| |\ \ | | | | | | | | Another place to use a request object in NullSessionHash
| | * | Another place to use a request object in NullSessionHash Ronak Jangir2015-08-231-3/+3
| | |/ | | | | | | | | | May be missed in 5fe141638f1243ac6ae187ae14aa398b4c1875a2 commit Also fixes the broken build
| * | Merge pull request #21343 from shunsukeaida/remove_broken_linkArun Agrawal2015-08-231-1/+1
| |\ \ | | | | | | | | Remove a link to the site that seems to be gone. [ci skip]
| | * | Remove a link to the site that seems to be gone. [ci skip]shunsukeaida2015-08-231-1/+1
| | |/ | | | | | | | | | Followup to #20637.
| * | Merge pull request #21332 from ronakjangir47/take_docsEileen M. Uchitelle2015-08-231-0/+25
| |\ \ | | |/ | |/| Added docs for CollectionProxy#take
| | * Added docs for CollectionProxy#take [ci skip]Ronak Jangir2015-08-231-0/+25
| | |
| * | Merge pull request #21338 from y-yagi/fix_strip_links_exampleAbdelkader Boudih2015-08-231-2/+2
| |\ \ | | | | | | | | fix syntax error in strip_links example [ci skip]
| | * | fix syntax error in strip_links example [ci skip]yuuji.yaginuma2015-08-231-2/+2
| | | | | | | | | | | | | | | | can not use double quotes in double quoted string without escape
| * | | Merge pull request #21335 from yui-knk/refactor/remove_not_used_block_argYves Senn2015-08-231-1/+1
| |\ \ \ | | |/ / | |/| | Remove not used a block argument (`&block`)
| | * | Remove not used a block argument (`&block`)yui-knk2015-08-231-1/+1
| | | |
| * | | Merge pull request #21334 from yui-knk/doc/about_comma_styleRichard Schneeman2015-08-221-0/+5
| |\ \ \ | | | | | | | | | | [ci skip] Add style guide about comma
| | * | | [ci skip] Add style guide about commayui-knk2015-08-231-0/+5
| | |/ /
| * | | use a request object in the session middlewareAaron Patterson2015-08-228-71/+77
| | | | | | | | | | | | | | | | | | | | This commit allows us to use one request object rather than allocating multiple request objects to deal with the session.
| * | | move more `@env` access to method callsAaron Patterson2015-08-221-16/+16
| | | | | | | | | | | | | | | | | | | | We're going to implement storing env values differently in the future, so let's disconnect these methods from the instance variables
| * | | move ORIGINAL_SCRIPT_NAME to the metaprogrammed methodsAaron Patterson2015-08-221-4/+1
| | | |
| * | | metaprogram the HTTP_X_REQUEST_ID methodAaron Patterson2015-08-221-6/+1
| | | | | | | | | | | | | | | | we're already doing this with a bunch of other header data.
| * | | use `body_stream` instead of getting the env value ourselvesAaron Patterson2015-08-221-1/+1
| | | | | | | | | | | | | | | | we have a method that knows how to get rack.input, so lets use that.
| * | | convert `@env` use to get / set headerAaron Patterson2015-08-221-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | We need to abstract the internals of the request object away from this instance variable so that the values for `@env` can be calculated in a different way.
| * | | use get / set header to avoid depending on the `env` ivarAaron Patterson2015-08-221-11/+14
| | | |
| * | | Merge pull request #20757 from bquorning/http-status-codes-changed-in-rackSantiago Pastorino2015-08-222-4/+14
| |\ \ \ | | | | | | | | | | Rack changed their status codes to IETF RFC 7231
| | * | | 4.2 release notes about `render` status optionsBenjamin Quorning2015-08-211-0/+11
| | | | |
| | * | | Rack changed their status codes to IETF RFC 7231Benjamin Quorning2015-08-211-4/+3
| | | | | | | | | | | | | | | | | | | | rack/rack#754
| * | | | Fix Railties test failure for asset routeseileencodes2015-08-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since none of the action pack tests failed without this conditional it didn't seem necessary. This fixes the build because it correctly returns a 404 instead of a 500 for the asset routes test. Test that was failing was in the `assets_test.rb` file and was the test named `test_assets_routes_are_not_drawn_when_compilation_is_disabled`.
| * | | | Refactor to remove controller class from route to requesteileencodes2015-08-223-41/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactoring moves the controller class name that was on the route set to the request. The purpose of this refactoring is for changes we need to move controller tests to integration tests, mainly being able to access the controller on the request instead of having to go through the router. [Eileen M. Uchitelle & Aaron Patterson]
| * | | | Merge pull request #21328 from jonatack/fix-debugging-rails-guideKasper Timm Hansen2015-08-221-7/+9
| |\ \ \ \ | | | | | | | | | | | | [skip ci] Debugging Rails Guide fixes
| | * | | | [skip ci] Debugging Rails Guide fixesJon Atack2015-08-221-7/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes: "we want go deep" -> "we won't go deep" "to next next line" -> "to the next line" - Minor improvements in clarity and grammar. Cheers :)
| * | | / Test against the newest stable ruby 2.2.3Akira Matsuda2015-08-221-1/+1
| | |_|/ | |/| |
| * | | set cached values in the env hashAaron Patterson2015-08-211-6/+9
| | | |
| * | | stop directly accessing `@env` in mime_negotiationAaron Patterson2015-08-211-8/+8
| | | | | | | | | | | | | | | | | | | | we want to go through methods to access `env` because in the future that ivar may not be available, or may be calculated lazily
| * | | use public API to fetch the parameter filterAaron Patterson2015-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | now the parameter filter doesn't need to know about the env hash in these two methds.
| * | | use methods on the request object to implement `fetch`Aaron Patterson2015-08-211-2/+8
| | | | | | | | | | | | | | | | Now the Headers internals don't depend on the env hash.
| * | | dup the env hash on Header#envAaron Patterson2015-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | This prevents external mutations from impacting the internals of the request or the Header object.
| * | | use accessors on the request object for manipulating envAaron Patterson2015-08-211-3/+3
| | | | | | | | | | | | | | | | | | | | this reduces the API footprint for the env hash so that we can be more flexible when changing API in the future
| * | | use `set_header` rather than []=Aaron Patterson2015-08-211-1/+1
| | | | | | | | | | | | | | | | This allows us to avoid calling `env_name` twice.
| * | | dup the request and mutate its headers object.Aaron Patterson2015-08-212-5/+5
| | | | | | | | | | | | | | | | duping the request will dup it's underlying env hash.
| * | | JSON is still an adapter specific type.Sean Griffin2015-08-218-36/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several changes were made in #21110 which I am strongly opposed to. (this is what I get for going on vacation. :trollface:) No type should be introduced into the generic `ActiveRecord::Type` namespace, and *certainly* should not be registered into the registry unconstrained unless it is supported by *all* adapters (which basically means that it was specified in the ANSI SQL standard). I do not think `# :nodoc:` ing the type is sufficient, as it still makes the code of Rails itself very unclear as to what the role of that class is. While I would argue that this shouldn't even be a super class, and that MySql and PG's JSON types are only superficially duplicated (they might look the same but will change for different reasons in the future). However, I don't feel strongly enough about it as a point of contention (and the biggest cost of harming the blameability has already occured), so I simply moved the superclass into a namespace where its role is absolutely clear. After this change, `attribute :foo, :json` will once again work with MySQL and PG, but not with Sqlite3 or any third party adapters. Unresolved questions -------------------- The types that and adapter publishes (at least those are unique to that adapter, and not adding additional behavior like `MysqlString` should probably be part of the adapter's public API. Should we standardize the namespace for these, and document them?
| * | | Move the CoC text to the Rails websiteGodfrey Chan2015-08-212-16/+6
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 01:14:12 +0000