Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #16172 from Agis-/hmt_scope_arity | Rafael Mendonça França | 2014-08-20 | 6 | -1/+29 | |
|\ \ \ \ | ||||||
| * | | | | Only merge scopes with zero arity in has_many through | Agis- | 2014-08-20 | 6 | -1/+29 | |
* | | | | | Merge pull request #16586 from seuros/master | Rafael Mendonça França | 2014-08-20 | 2 | -16/+16 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | slainer68 | 2014-08-20 | 2 | -0/+2 | |
* | | | | | | | 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. | Juanito Fatas | 2014-08-20 | 1 | -16/+22 | |
* | | | | | | | Fixes the digits counter of AS's NumberToRoundedConverter | Xavier Noria | 2014-08-20 | 2 | -1/+2 | |
* | | | | | | | 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 | 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 | 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.". | Juanito Fatas | 2014-08-20 | 2 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | 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 | 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 | 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 | |
|/ / / / / | ||||||
* | | | | | [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. | 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::Tes... | Lucas Mazza | 2014-08-19 | 1 | -0/+9 | |
|/ / / / | ||||||
* | | | | 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 | |
* | | | | 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 | |
|\ \ \ \ | ||||||
| * | | | | Auth token mask from breach-mitigation-rails gem | Bradley Buda | 2014-08-19 | 2 | -8/+71 | |
* | | | | | Synced Active Support release notes [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+21 | |
* | | | | | Use the released turbolinks gem | Carlos Antonio da Silva | 2014-08-19 | 1 | -3/+1 | |
* | | | | | Fix setting simple values to the new config.x | Carlos Antonio da Silva | 2014-08-19 | 4 | -13/+24 | |
* | | | | | Point to right sass-rails version | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 | |
* | | | | | Synced Active Model changelogs [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -4/+16 |