| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |/ / / | |||||
| * | | | 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 |
| | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |