| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |/ / | |||||
| * | | Merge pull request #16582 from cristianbica/actionmailer-deprecate-deliver | Rafael Mendonça França | 2014-08-20 | 19 | -101/+227 |
| |\ \ | | | | | | | Deprecated ActionMailer .deliver and updated ActionMailer / ActiveJob docs/guide | ||||
| | * | | Updated rdoc / guides / release notes related to ActiveJob / ActionMailer | Cristian Bica | 2014-08-20 | 11 | -54/+141 |
| | | | | |||||
| | * | | Deprecated .deliver / .deliver! to .deliver_now / .deliver_now! | Cristian Bica | 2014-08-20 | 9 | -53/+92 |
| | | | | |||||
| * | | | Merge pull request #16585 from nicolasblanco/require_active_job | Rafael Mendonça França | 2014-08-20 | 2 | -0/+2 |
| |\ \ \ | | | | | | | | | Require ActiveJob in case a skip_xxx option is given | ||||
| | * | | | Require ActiveJob in case a skip_xxx option is given | slainer68 | 2014-08-20 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | Change position of require active_job | ||||
| * | | | | Merge pull request #16583 from JuanitoFatas/doc/patch-1 | Rafael Mendonça França | 2014-08-20 | 1 | -16/+22 |
| |\ \ \ \ | |_|/ / |/| | | | [ci skip] Format pass of Active Job Basics guide. | ||||
| | * | | | [ci skip] Format pass of Active Job Basics guide. | Juanito Fatas | 2014-08-20 | 1 | -16/+22 |
| | | | | | |||||
| * | | | | Fixes the digits counter of AS's NumberToRoundedConverter | Xavier Noria | 2014-08-20 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zero has one digit, but Math.log10(0) returns -Infinity. The method needs to special-case zero. The patch adds a regression test that is not clearly related to the underlying issue because digit_count is private and has no coverage. Gray area. This bug was uncovered by 60062cf. | ||||
| * | | | | Merge pull request #16145 from phoet/patch-2 | Rafael Mendonça França | 2014-08-20 | 2 | -10/+15 |
| |\ \ \ \ | |_|/ / |/| | | | don't log errors when all is fine | ||||
| | * | | | don't log errors when all is fine | Peter Schröder | 2014-07-17 | 2 | -10/+15 |
| | | | | | |||||
| * | | | | Merge pull request #16573 from zzak/test_test_to_test_case_test | Santiago Pastorino | 2014-08-20 | 1 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | Move as/test_test to as/test_case_test | ||||
| | * | | | | Move as/test_test to as/test_case_test | Zachary Scott | 2014-08-19 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #16581 from JuanitoFatas/guides-anchor-link | Xavier Noria | 2014-08-20 | 2 | -2/+2 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Revert "Do not gsub non ASCII characters in header anchor.". | ||||
| | * | | | | Revert "Do not gsub non ASCII characters in header anchor.". | Juanito Fatas | 2014-08-20 | 2 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit 699babe. Also change the upgrading_ruby_on_rails link back to original in 4_2_release_notes. | ||||
| * | | | | Merge pull request #16577 from cristianbica/update-deprecation-to-5.0 | Matthew Draper | 2014-08-20 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Updated the deprecation warnings to 5.0 | ||||
| | * | | | | Updated the deprecation warnings to 5.0 | Cristian Bica | 2014-08-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Clear deliveries in order not to affect other tests | Akira Matsuda | 2014-08-20 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #16579 from nsinenko/master | Xavier Noria | 2014-08-20 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove end-of-line spacing in development.rb, production.rb | ||||
| | * | | | | | remove end-of-line spacing in development.rb, production.rb | Nick Sinenko | 2014-08-20 | 2 | -2/+2 |
| |/ / / / / | |||||
| * / / / / | Ignore Postgresql "SELECT tablename FROM pg_tables" when counting queries | Akira Matsuda | 2014-08-20 | 1 | -1/+1 |
| |/ / / / | |||||
| * / / / | Add documentation intro to example for `Object#itself`. | Zachary Scott | 2014-08-19 | 1 | -2/+5 |
| |/ / / | | | | | | | | | | | | | Also moved comment for removal above `unless()` to not confuse RDoc with the documentation for this method. | ||||
| * | | | [ci skip] "..enables interrorgating of [thing].." would be correct | Zachary Scott | 2014-08-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Drop schema_migrations table only when exists | Akira Matsuda | 2014-08-20 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Merge pull request #16572 from lucasmazza/lm-remove-actionmailer-global-helpers | Rafael Mendonça França | 2014-08-19 | 2 | -13/+1 |
| |\ \ | | | | | | | Remove global helpers from the ActionMailer test suite. | ||||
| | * | | Remove global helpers from the ActionMailer test suite. | Lucas Mazza | 2014-08-19 | 2 | -13/+1 |
| |/ / | |||||
| * | | Extra space | David Heinemeier Hansson | 2014-08-19 | 1 | -1/+0 |
| | | | |||||
| * | | Merge pull request #16571 from lucasmazza/lm-fix-actionmailer-test-case | Rafael Mendonça França | 2014-08-19 | 1 | -0/+9 |
| |\ \ | | | | | | | Add `set_delivery_method` and `restore_delivery_method` to `ActionMailer::TestCase. | ||||
| | * | | Add `set_delivery_method` and `restore_delivery_method` to ↵ | Lucas Mazza | 2014-08-19 | 1 | -0/+9 |
| |/ / | | | | | | | | | | | | | | | `ActionMailer::TestCase`. This way these methods are available outside the ActionMailer test suite, but they are still duplicated inside `test/abstract_unit` for test cases that don't inherit from the `ActionMailer::TestCase` class. | ||||
| * | | Create a group to active job gems | Rafael Mendonça França | 2014-08-19 | 1 | -11/+13 |
| | | | |||||
| * | | Copy & paste fail [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -1/+1 |
| | | | |||||
| * | | :nail_care: The note doesn't look good on the blue background [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -2/+2 |
| | | | |||||
| * | | :bomb: oops, it should be 4.2 that's WIP [ci skip] | Godfrey Chan | 2014-08-19 | 2 | -5/+4 |
| | | | |||||
| * | | Some placeholders for the 4.2 upgrade guide [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+16 |
| | | | |||||
| * | | Clearly mark these as WIP, and invite people to contribute. [ci skip] | Godfrey Chan | 2014-08-19 | 2 | -1/+6 |
| | | | |||||
| * | | List the 4.2 release notes in the index, mark it as WIP [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+5 |
| | | | |||||
| * | | Major features in 4.2 release notes [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+40 |
| | | | |||||
| * | | Fix failing railties tests | Carlos Antonio da Silva | 2014-08-19 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | A combination of two commits led into these failures: * The addition of a new active_record config in 24bb8347b6ff0da90059314d9aece7a2c94a272c * The revert of the config to use config.x as options holder in 43073b393d234acd094ac7c220163f4e419d11f5 These tests remove activerecord from the load path, however the configuration is still in the application file, and they blow up. | ||||
| * | | Fix blank link on config/application.rb app template [ci skip] | Carlos Antonio da Silva | 2014-08-19 | 1 | -1/+1 |
| | | | |||||
| * | | Synced AR release notes [ci-skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+18 |
| | | | |||||
| * | | Merge pull request #16570 from bradleybuda/breach-mitigation-mask-csrf-token | Jeremy Kemper | 2014-08-19 | 2 | -8/+71 |
| |\ \ | | | | | | | CSRF token mask from breach-mitigation-rails gem | ||||
| | * | | Auth token mask from breach-mitigation-rails gem | Bradley Buda | 2014-08-19 | 2 | -8/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges in the code from the breach-mitigation-rails gem that masks authenticity tokens on each request by XORing them with a random set of bytes. The masking is used to make it impossible for an attacker to steal a CSRF token from an SSL session by using techniques like the BREACH attack. The patch is pretty simple - I've copied over the [relevant code](https://github.com/meldium/breach-mitigation-rails/blob/master/lib/breach_mitigation/masking_secrets.rb) and updated the tests to pass, mostly by adjusting stubs and mocks. | ||||
| * | | | Synced Active Support release notes [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+21 |
| | | | | | | | | | | | | | [Godfrey Chan, Genadi Samokovarov] | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |