| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | just use the placeholder tag value if it is passed as a String | Alex Robbin | 2014-08-22 | 2 | -5/+22 |
| | | |||||
| * | add I18n support for `:placeholder` HTML option is passed to form fields | Alex Robbin | 2014-08-22 | 5 | -0/+214 |
| | | |||||
| * | Merge pull request #16633 from tgxworld/prefer_log_message_through_block | Yves Senn | 2014-08-22 | 1 | -4/+4 |
| |\ | | | | | Pass logging message through block. | ||||
| | * | Pass logging message through block. | Guo Xiang Tan | 2014-08-22 | 1 | -4/+4 |
| | | | | | | | | | This follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance | ||||
| * | | Merge pull request #16634 from tgxworld/missing_space | Zachary Scott | 2014-08-22 | 1 | -1/+1 |
| |\ \ | |/ |/| | Missing space. [CI SKIP] | ||||
| | * | Missing space. [CI SKIP] | Guo Xiang Tan | 2014-08-22 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #11859 from zzak/nested_model_forms_guide | Zachary Scott | 2014-08-22 | 1 | -1/+4 |
| |\ | | | | | See AR::Associations for greater detail in Nested Model Forms Guide [ci skip] | ||||
| | * | add nested_model_forms to guides/documents.yaml [wip] [ci skip] | Zachary Scott | 2014-08-22 | 1 | -1/+4 |
| |/ | |||||
| * | Merge branch 'jonatack-patch-8' | Zachary Scott | 2014-08-22 | 1 | -2/+6 |
| |\ | |||||
| | * | Follow up on #16408 | Jon Atack | 2014-08-22 | 1 | -2/+6 |
| |/ | | | | [skip ci] | ||||
| * | [ci skip] Running AR tests guide [Fixes GH-15891] | Zachary Scott | 2014-08-22 | 1 | -2/+2 |
| | | | | | Patch by @bcjordan | ||||
| * | Merge pull request #16630 from ↵ | Zachary Scott | 2014-08-22 | 1 | -0/+12 |
| |\ | | | | | | | | | tomkadwill/added_has_and_belongs_to_many_scope_documentation [ci skip] Added documentation for has_and_belongs_to_many scope parameter | ||||
| | * | [ci skip] Added documentation for has_and_belongs_to_many scope parameter | Tom Kadwill | 2014-08-22 | 1 | -0/+12 |
| |/ | |||||
| * | Merge pull request #16629 from rails/revert-16438-input-placeholder-i18n | Jeremy Kemper | 2014-08-21 | 5 | -214/+0 |
| |\ | | | | | Revert "Add I18n support for `:placeholder` HTML option is passed to for... | ||||
| | * | Revert "Add I18n support for `:placeholder` HTML option is passed to form ↵ | Jeremy Kemper | 2014-08-21 | 5 | -214/+0 |
| |/ | | | | fields" | ||||
| * | Merge pull request #16604 from saarons/clean-remote-ip-middleware | Jeremy Kemper | 2014-08-21 | 3 | -53/+61 |
| |\ | | | | | ActionDispatch::RemoteIp accept IPAddr matches for trusted proxies | ||||
| | * | Refactor ActionDispatch::RemoteIp | Sam Aarons | 2014-08-21 | 3 | -53/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored IP address checking in ActionDispatch::RemoteIp to rely on the IPAddr class instead of the unwieldly regular expression to match IP addresses. This commit keeps the same api but allows users to pass IPAddr objects to config.action_dispatch.trusted_proxies in addition to passing strings and regular expressions. Example: # config/environments/production.rb config.action_dispatch.trusted_proxies = IPAddr.new('4.8.15.0/16') | ||||
| * | | fix grammar [ci skip] | Vijay Dev | 2014-08-22 | 1 | -1/+1 |
| | | | |||||
| * | | fix server names [ci skip] | Vijay Dev | 2014-08-22 | 1 | -1/+1 |
| |/ | | | Per feedback in https://github.com/rails/rails/commit/af63e4a2546629c3fb2d53cffb7d4ea0e8663f68#commitcomment-7477636 | ||||
| * | ActiveJob -> Active Job [ci skip] | Xavier Noria | 2014-08-21 | 3 | -3/+3 |
| | | | | | See http://guides.rubyonrails.org/api_documentation_guidelines.html#wording | ||||
| * | applies API guidelines to new AM docs | Xavier Noria | 2014-08-21 | 2 | -32/+32 |
| | | |||||
| * | Merge pull request #16621 from Calyhre/patch-1 | Rafael Mendonça França | 2014-08-21 | 1 | -0/+3 |
| |\ | | | | | Update documentation, Add change to ActionView Notable changes | ||||
| | * | 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 | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |