Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #18416 from caike/master | Rafael Mendonça França | 2015-01-09 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add _mailer suffix to i18n path | Carlos Souza | 2015-01-08 | 3 | -6/+6 | |
* | | | | | | | | Merge pull request #18417 from yoshiokatsuneo/active_record_connection_pool_e... | Sean Griffin | 2015-01-09 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | ActiveRecord: release connection on reconnect failure. | Yoshioka Tsuneo | 2015-01-09 | 1 | -0/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18410 from seuros/ripfilter | Rafael Mendonça França | 2015-01-08 | 3 | -9/+37 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Deprecate all *_filter callbacks in favor of *_action callbacks | Abdelkader Boudih | 2015-01-08 | 3 | -9/+37 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18404 from claudiob/rebase-14549 | Rafael Mendonça França | 2015-01-08 | 2 | -0/+44 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add test/doc for :if/:except in skip_before_action | claudiob | 2015-01-08 | 2 | -2/+24 | |
| * | | | | | | Add test case and documentation for skip_before_filter. | Lauro Caetano | 2015-01-08 | 2 | -0/+22 | |
* | | | | | | | Fix the example (for realz) | David Heinemeier Hansson | 2015-01-08 | 1 | -1/+1 | |
* | | | | | | | Fix the example | David Heinemeier Hansson | 2015-01-08 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #18334 from simi/prepend-false-for-protect-from-forgery | David Heinemeier Hansson | 2015-01-08 | 3 | -1/+91 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add prepend option to protect_from_forgery. | Josef Šimánek | 2015-01-08 | 3 | -1/+91 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #18371 from brainopia/remove_hide_actions | David Heinemeier Hansson | 2015-01-08 | 5 | -93/+7 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Remove ActionController::HideActions (closes #18336) | brainopia | 2015-01-06 | 5 | -93/+7 | |
* | | | | | | | Document has_many :extend option | Caleb Thompson | 2015-01-08 | 1 | -0/+4 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #18403 from georgeclaghorn/enqueued-email-assertions | David Heinemeier Hansson | 2015-01-08 | 5 | -2/+144 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add assert_enqueued_emails and assert_no_enqueued_emails | George Claghorn | 2015-01-08 | 3 | -0/+115 | |
| * | | | | | | Add :only option to assert_no_enqueued_jobs | George Claghorn | 2015-01-08 | 2 | -2/+29 | |
|/ / / / / / | ||||||
* | | | | | | Fix Active Job changelog formatting and reword a bit [ci skip] | Carlos Antonio da Silva | 2015-01-08 | 1 | -24/+22 | |
* | | | | | | Merge pull request #18397 from georgeclaghorn/enhance-job-assertions | David Heinemeier Hansson | 2015-01-07 | 3 | -7/+76 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add :only option to assert_enqueued_jobs | George Claghorn | 2015-01-07 | 3 | -7/+76 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #16640 from mfazekas/fix_loop_in_changed_for_autosave | Godfrey Chan | 2015-01-07 | 2 | -4/+21 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix potenital stack level too deep with autosave or validation | Miklos Fazkeas | 2015-01-04 | 2 | -4/+21 | |
* | | | | | | | Merge pull request #18377 from brainopia/custom_connection_with_count | Sean Griffin | 2015-01-07 | 2 | -1/+8 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Fix count on a separate connection (fixes #18359) | brainopia | 2015-01-08 | 2 | -1/+8 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #18378 from shunsukeaida/avoid_orm_being_humanized_in_gene... | Carlos Antonio da Silva | 2015-01-07 | 2 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | acronyms like ORM should be in uppercase, so overwrite the desc generated by ... | shunsukeaida | 2015-01-07 | 2 | -2/+2 | |
* | | | | | | | Move changelog entry to the top [ci skip] | Carlos Antonio da Silva | 2015-01-07 | 1 | -7/+5 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #18074 from caike/master | Rafael Mendonça França | 2015-01-06 | 9 | -38/+58 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Add mailer suffix to generated files and classes | Carlos Souza | 2015-01-06 | 9 | -38/+58 | |
* | | | | | | Use Ruby's #include? to avoid relying on AS extension | Carlos Antonio da Silva | 2015-01-06 | 1 | -1/+1 | |
* | | | | | | Merge pull request #18368 from kuldeepaggarwal/fix-attribute-scope | Carlos Antonio da Silva | 2015-01-06 | 1 | -3/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix `attribute` method scoping(i.e. private) | Kuldeep Aggarwal | 2015-01-06 | 1 | -3/+1 | |
* | | | | | | | Merge pull request #18370 from LindseyB/patch-1 | Guillermo Iguaran | 2015-01-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Changing sets -> set | Lindsey Bieda | 2015-01-06 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #18335 from georgeclaghorn/day-gymnastics | David Heinemeier Hansson | 2015-01-06 | 3 | -17/+151 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add #prev_day and #next_day as counterparts to #yesterday and #tomorrow for D... | George Claghorn | 2015-01-06 | 3 | -6/+31 | |
| * | | | | | | Add same_time option to #prev_week and #next_week for Date, Time, and DateTime | George Claghorn | 2015-01-06 | 3 | -17/+42 | |
| * | | | | | | Add #on_weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and... | George Claghorn | 2015-01-06 | 3 | -0/+84 | |
* | | | | | | | Merge pull request #18366 from codeodor/patch-1 | Rafael Mendonça França | 2015-01-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Add log_level options to configuration guide | Sammy Larbi | 2015-01-06 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18362 from georgemillo/attribute | Rafael Mendonça França | 2015-01-06 | 1 | -3/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | replacing 'attribute' method with an alias | George Millo | 2015-01-06 | 1 | -3/+2 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #18364 from prathamesh-sonpatki/ar-changelog-typos | Abdelkader Boudih | 2015-01-06 | 1 | -5/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed typos and wording in ActiveRecord CHANGELOG [ci skip] | Prathamesh Sonpatki | 2015-01-06 | 1 | -5/+5 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18358 from prathamesh-sonpatki/add-test-for-non-string-la... | Yves Senn | 2015-01-06 | 4 | -1/+12 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix lookup of fixtures with non-string label | Prathamesh Sonpatki | 2015-01-06 | 4 | -1/+13 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #18354 from simi/improve-request-forgery-documentation | David Heinemeier Hansson | 2015-01-05 | 1 | -3/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Improve protect_from_forgery documentation. [ci skip]. | Josef Šimánek | 2015-01-06 | 1 | -3/+3 |