| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add change to ActionView Notable changes [ci skip] | Charley D | 2014-08-21 | 1 | -0/+3 |
| | | |||||
| * | Merge pull request #16271 from alol/action-view-overview-guide-tweaks | Vijay Dev | 2014-08-22 | 1 | -11/+11 |
| |\ | | | | | Small Action View Overview guide grammar and readability tweaks | ||||
| | * | Small Action View Overview edits [ci skip] | Alan Oliver | 2014-07-24 | 1 | -11/+11 |
| | | | | | | | | | Some small grammar and readability edits | ||||
| * | | Merge pull request #16204 from jonatack/patch-7 | Vijay Dev | 2014-08-21 | 1 | -12/+14 |
| |\ \ | | | | | | | Fix minor typos and improve grammar and code formatting | ||||
| | * | | Grammar pass | Jon Atack | 2014-08-19 | 1 | -12/+14 |
| | | | | | | | | | | | | | | | | | | | [ci skip] Add improvements from @eileencodes [skip ci] | ||||
| * | | | Merge pull request #16617 from tomkadwill/added_has_one_scope_documentation | Zachary Scott | 2014-08-21 | 1 | -0/+11 |
| |\ \ \ | | | | | | | | | [ci skip] Added documentation for has_one scope parameter | ||||
| | * | | | [ci skip] Added documentation for has_one scope parameter | Tom Kadwill | 2014-08-21 | 1 | -0/+11 |
| | | | | | |||||
| * | | | | Merge pull request #16615 from tgxworld/guide_fix | Zachary Scott | 2014-08-21 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] Grammar fixes for upgrade guide from 4.0 to 4.1 | ||||
| | * | | | | Guide fix. [CI SKIP] | Guo Xiang Tan | 2014-08-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | Related: https://github.com/rails/rails/pull/16607 | ||||
| * | | | | | Make text consistent in help text of rails server and console commands. | Vijay Dev | 2014-08-21 | 2 | -13/+13 |
| |/ / / / | |||||
| * | | | | Merge pull request #16612 from loganhasson/master | Zachary Scott | 2014-08-21 | 1 | -5/+5 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] Clarify Action Mailer/Active Job usage note | ||||
| | * | | | | [ci skip] Clarify Action Mailer/Active Job usage note | Logan Hasson | 2014-08-21 | 1 | -5/+5 |
| | |/ / / | |||||
| * | | | | Merge pull request #16607 from tgxworld/upgrading_guide_pass | Santiago Pastorino | 2014-08-21 | 1 | -9/+10 |
| |\ \ \ \ | |/ / / |/| | | | Upgrade guide pass. [CI SKIP] | ||||
| | * | | | Upgrade guide pass. [CI SKIP] | Guo Xiang Tan | 2014-08-21 | 1 | -9/+10 |
| | | | | | |||||
| * | | | | Merge pull request #16608 from GRoguelon/fix_issues_in_4_2_release_notes | Yves Senn | 2014-08-21 | 1 | -3/+0 |
| |\ \ \ \ | | | | | | | | | | | Fix some issues in 4.2 release notes. [ci skip] | ||||
| | * | | | | Fix some issues in 4.2 release notes. | Geoffrey ROGUELON | 2014-08-21 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate line in Railties. [ci skip] | ||||
| * | | | | | Merge pull request #15443 from tgxworld/preload_head_routes | Andrew White | 2014-08-21 | 5 | -24/+80 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Map HEAD requests to GET routes instead of duplicating GET routes. | ||||
| | * | | | | Improve router test. | Guo Xiang Tan | 2014-08-21 | 1 | -6/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | We should assert that routes will not be recognized if the verbs do not match. | ||||
| | * | | | | Avoid duplicating routes for HEAD requests. | Guo Xiang Tan | 2014-08-21 | 5 | -18/+69 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to rails#15321 Instead of duplicating the routes, we will first match the HEAD request to HEAD routes. If no match is found, we will then map the HEAD request to GET routes. | ||||
| * | | | | Merge pull request #16603 from jwworth/task/fix_grammar | Zachary Scott | 2014-08-20 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] 4.2 release notes grammar fix | ||||
| | * | | | | Change 'does' to 'do' | Jake Worth | 2014-08-21 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #16466 from schneems/schneems/gzip-action-dispatch | Guillermo Iguaran | 2014-08-20 | 7 | -16/+76 |
| |\ \ \ \ | |/ / / |/| | | | Enable gzip compression by default | ||||
| | * | | | Enable gzip compression by default | schneems | 2014-08-20 | 7 | -16/+76 |
| |/ / / | | | | | | | | | | | | | | | | If someone is using ActionDispatch::Static to serve assets and makes it past the `match?` then the file exists on disk and it will be served. This PR adds in logic that checks to see if the file being served is already compressed (via gzip) and on disk, if it is it will be served as long as the client can handle gzip encoding. If not, then a non gzip file will be served. This additional logic slows down an individual asset request but should speed up the consumer experience as compressed files are served and production applications should be delivered with a CDN. This PR allows a CDN to cache a gzip file by setting the `Vary` header appropriately. In net this should speed up a production application that are using Rails as an origin for a CDN. Non-asset request speed is not affected in this PR. | ||||
| * | | | Merge pull request #16600 from bradly/spelling-fix-in-testing-guide | Zachary Scott | 2014-08-20 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | [ci skip] Fixing spelling typo in testing guide. | ||||
| | * | | | [ci skip] Fixing spelling typo in testing guide. | Bradly Feeley | 2014-08-20 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | "warning: assigned but unused variable" | Akira Matsuda | 2014-08-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix SyntaxError | Akira Matsuda | 2014-08-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #16597 from teeparham/master | Zachary Scott | 2014-08-20 | 1 | -2/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | Remove cached attributes from Configuring guide [ci skip] This was removed in #15429 | ||||
| | * | | | Update configuring.md [ci skip] | Tee Parham | 2014-08-20 | 1 | -2/+0 |
| |/ / / | | | | | | | Remove ActiveRecord config instructions for active_record.attribute_types_cached_by_default, which was removed in https://github.com/rails/rails/commit/66736c8e50585 | ||||
| * | | | Make the explicit the Active Job dependency of Action Mailer | Rafael Mendonça França | 2014-08-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | Remove timestamp type from generator usage | Rafael Mendonça França | 2014-08-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | It was soft removed at 03035d69e14032a589e9653e3145237b8a9a09be | ||||
| * | | | Merge pull request #16594 from loganhasson/master | Zachary Scott | 2014-08-20 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | [ci skip] Fix Active Job grammar in api docs | ||||
| | * | | | [ci skip] Fix Active Job grammar in api docs | Logan Hasson | 2014-08-20 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #16593 from aditya-kapoor/add-doc-for-step | Zachary Scott | 2014-08-20 | 1 | -3/+6 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] add doc for STEP in migration | ||||
| | * | | | | [ci skip] add doc for STEP in migration | Aditya Kapoor | 2014-08-21 | 1 | -3/+6 |
| | |/ / / | |||||
| * | | | | Merge pull request #16575 from tomkadwill/added_has_many_scope_documentation | Zachary Scott | 2014-08-20 | 1 | -0/+11 |
| |\ \ \ \ | |/ / / |/| | | | [ci skip] Added documentation for has_many scope parameter | ||||
| | * | | | [ci skip] Added documentation for has_many scope parameter | Tom Kadwill | 2014-08-20 | 1 | -0/+11 |
| | | | | | |||||
| * | | | | Merge pull request #16592 from aditya-kapoor/fix-migration-docs | Santiago Pastorino | 2014-08-20 | 1 | -9/+2 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] correct docs about the migration generation | ||||
| | * | | | | [ci skip] correct docs about the migration generation | Aditya Kapoor | 2014-08-21 | 1 | -9/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #16590 from loganhasson/master | Zachary Scott | 2014-08-20 | 1 | -8/+8 |
| |\ \ \ \ \ | |/ / / / |/| | | | | [ci skip] Fix typos/grammar in Active Job guide | ||||
| | * | | | | Fix a few typos/some grammar in Active Job Basics | Logan Hasson | 2014-08-20 | 1 | -8/+8 |
| |/ / / / | |||||
| * | | | | Same as f39cb2b except backport friendly | Zachary Scott | 2014-08-20 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | Point release notes to stable branch for list of commits. [ci skip] | ||||
| * | | | | Same as f39cb2b except backport friendly | Zachary Scott | 2014-08-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | Point release notes to stable branch for list of commits. [ci skip] | ||||
| * | | | | Point release notes to stable branch for list of commits. [ci skip] | Zachary Scott | 2014-08-20 | 6 | -9/+15 |
| | | | | | |||||
| * | | | | Merge pull request #16587 from seuros/master | Rafael Mendonça França | 2014-08-20 | 2 | -16/+16 |
| |\ \ \ \ | | | | | | | | | | | [Rdoc] Make clear that we are sending an AR object [ci skip] | ||||
| | * | | | | [Rdoc] Make clear that we are sending an AR object [ci skip] | Abdelkader Boudih | 2014-08-20 | 2 | -16/+16 |
| |/ / / / | |||||
| * | | | | Merge pull request #16172 from Agis-/hmt_scope_arity | Rafael Mendonça França | 2014-08-20 | 6 | -1/+29 |
| |\ \ \ \ | | | | | | | | | | | has_many :through with dynamic condition merging | ||||
| | * | | | | Only merge scopes with zero arity in has_many through | Agis- | 2014-08-20 | 6 | -1/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with dynamic conditions. Fixes #16128 This bug was introduced in https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d so it's present from 4.1.2-rc1 and after. https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d merges any relation scopes passed as proc objects to the relation, but does *not* take into account the arity of the lambda. To reproduce: https://gist.github.com/Agis-/5f1f0d664d2cd08dfb9b | ||||
| * | | | | | Merge pull request #16586 from seuros/master | Rafael Mendonça França | 2014-08-20 | 2 | -16/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix typo in rdoc [ci skip] | ||||
| | * | | | | | Fix typo in rdoc [ci skip] | Abdelkader Boudih | 2014-08-20 | 2 | -16/+16 |
| |/ / / / / | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |