Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 file names. | ||||
| * | Add mailer suffix to generated files and classes | Carlos Souza | 2015-01-06 | 9 | -38/+58 |
| | | | | | | | | | | Following the same naming convention used in controllers and jobs. | ||||
* | | Use Ruby's #include? to avoid relying on AS extension | Carlos Antonio da Silva | 2015-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | The build has failed when running the date/time ext tests in isolation due to the missing extension, so better than adding a require is using just Ruby in this case. https://travis-ci.org/rails/rails/jobs/46107954#L1077 | ||||
* | | 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) | ||||
| * | | fix `attribute` method scoping(i.e. private) | Kuldeep Aggarwal | 2015-01-06 | 1 | -3/+1 |
| | | | | | | | | | | | | ref #52f641264b1325a4c2bdce7971b14524bd4905f1 | ||||
* | | | Merge pull request #18370 from LindseyB/patch-1 | Guillermo Iguaran | 2015-01-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Changing sets -> set [ci-skip] | ||||
| * | | | Changing sets -> set | Lindsey Bieda | 2015-01-06 | 1 | -1/+1 |
|/ / / | | | | | | | Updating some minor grammar issue. | ||||
* | | | Merge pull request #18335 from georgeclaghorn/day-gymnastics | David Heinemeier Hansson | 2015-01-06 | 3 | -17/+151 |
|\ \ \ | |/ / |/| | | Add #weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and DateTime | ||||
| * | | Add #prev_day and #next_day as counterparts to #yesterday and #tomorrow for ↵ | George Claghorn | 2015-01-06 | 3 | -6/+31 |
| | | | | | | | | | | | | Date, Time, and DateTime | ||||
| * | | 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, ↵ | George Claghorn | 2015-01-06 | 3 | -0/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and DateTime `#on_weekend?` returns true if the receiving date/time falls on a Saturday or Sunday. `#next_weekday` returns a new date/time representing the next day that does not fall on a Saturday or Sunday. `#prev_weekday` returns a new date/time representing the previous day that does not fall on a Saturday or Sunday. | ||||
* | | | 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 | ||||
| * | | 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 | ||||
| * | | 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] | ||||
| * | | Fixed typos and wording in ActiveRecord CHANGELOG [ci skip] | Prathamesh Sonpatki | 2015-01-06 | 1 | -5/+5 |
|/ / | |||||
* | | Merge pull request #18358 from ↵ | Yves Senn | 2015-01-06 | 4 | -1/+12 |
|\ \ | |/ |/| | | | | | | | prathamesh-sonpatki/add-test-for-non-string-labeled-fixtures Fix lookup of fixtures with non-string(like Fixnum) label | ||||
| * | Fix lookup of fixtures with non-string label | Prathamesh Sonpatki | 2015-01-06 | 4 | -1/+13 |
|/ | | | | | | | | | | | - Fixtures with non-string labels such as integers should be accessed using integer label as key. For eg. pirates(1) or pirates(42). - But this results in NotFound error because the label is converted into string before looking up into the fixtures hash. - After this commit, the label is converted into string only if its a symbol. - This issue was fount out while adding a test case for https://github.com/rails/rails/commit/7b910917. | ||||
* | Merge pull request #18354 from simi/improve-request-forgery-documentation | David Heinemeier Hansson | 2015-01-05 | 1 | -3/+3 |
|\ | | | | | Improve protect_from_forgery documentation. | ||||
| * | Improve protect_from_forgery documentation. [ci skip]. | Josef Šimánek | 2015-01-06 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #18356 from georgemillo/singularize | Rafael Mendonça França | 2015-01-05 | 1 | -2/+2 |
|\ \ | | | | | | | removing unecessary default parameter in private method | ||||
| * | | removing unecessary parameter in private method | George Millo | 2015-01-06 | 1 | -2/+2 |
| | | | | | | | | | | | | '_singularize' only ever gets called with one argument | ||||
* | | | Merge pull request #18355 from georgemillo/docs | Sean Griffin | 2015-01-05 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Documenting 'remove_possible_method' and 'redefine_method' [ci skip] | ||||
| * | | | adding documentation for 'remove_possible_method' and 'redefine_method' [ci ↵ | George Millo | 2015-01-05 | 1 | -0/+3 |
| |/ / | | | | | | | | | | skip] | ||||
* | | | Merge pull request #18350 from brainopia/fix_build_from_bind_values | Sean Griffin | 2015-01-05 | 2 | -2/+12 |
|\ \ \ | |_|/ |/| | | Propagate bind_values from join in subquery | ||||
| * | | Correctly fetch bind_values from join in subquery | brainopia | 2015-01-06 | 2 | -2/+12 |
| | | | |||||
* | | | Define attribute methods before attempting to populate records | Sean Griffin | 2015-01-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | `initialize_internals_callback` will attempt to assign attributes from the current scope, which will fail if something defined the method and calls super (meaning it won't hit `method_missing`). Fixes #18339 | ||||
* | | | Whitespace fixes from #18349 | Sean Griffin | 2015-01-05 | 1 | -2/+1 |
| | | | |||||
* | | | Merge pull request #18349 from jdelStrother/primarykeyless | Sean Griffin | 2015-01-05 | 2 | -1/+23 |
|\ \ \ | |/ / |/| | | Fix rollback of primarykey-less tables | ||||
| * | | Fix rollback of primarykey-less tables | Jonathan del Strother | 2015-01-05 | 2 | -1/+23 |
| | | | | | | | | | If you have a table without a primary key, and an `after_commit` callback on that table (ie `has_transactional_callbacks?` returns true), then trying to rollback a transaction involving that record would result in “ActiveModel::MissingAttributeError: can't write unknown attribute ``” | ||||
* | | | Avoid changing the global state on the tests | Rafael Mendonça França | 2015-01-05 | 1 | -1/+6 |
| | | | |||||
* | | | Merge pull request #17676 from ↵ | Rafael Mendonça França | 2015-01-05 | 2 | -6/+27 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | tigrish/fix_custom_i18n_exception_handler_regression Fix I18n regression introduced by #13832 | ||||
| * | | | Fix I18n regression introduced by #13832 | Christopher Dell | 2014-11-19 | 2 | -6/+27 |
| | | | | | | | | | | | | | | | | Previously, when the `:raise` options was set to `false`, it would get overwritten to `true`, preventing custom exception handlers to be used. | ||||
* | | | | Merge pull request #17720 from rzane/firebird-test-support | Rafael Mendonça França | 2015-01-05 | 5 | -21/+28 |
|\ \ \ \ | | | | | | | | | | | | | | | | Add Firebird support to test suite | ||||
| * | | | | Add firebird support to test suite | Ray Zane | 2015-01-05 | 5 | -21/+28 |
|/ / / / | |||||
* | | | | Merge pull request #18344 from jonatack/patch-1 | Rafael Mendonça França | 2015-01-05 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Clean up secure_token_test | ||||
| * | | | | Clean up secure_token_test | Jon Atack | 2015-01-05 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Merge pull request #18345 from mtthgn/patch-1 | Rafael Mendonça França | 2015-01-05 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix TypeError in Fixture creation | ||||
| * | | | | Fix TypeError in Fixture creation | Matt Hogan | 2015-01-05 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 4.2 started doing `value.gsub('$LABEL', label)` for fixture label interpolation, but you can have have valid YAML where `label` isn't a String. For example: ```YAML 0: name: John email: johndoe@gmail.com 1: name: Jane email: janedoe@gmail.com ``` This YAML will create a label that is a Fixnum, causing `TypeError: no implicit conversion of Fixnum into String.` | ||||
* | | | | reflects changes in 34cd7e2 in the index [ci skip] | Xavier Noria | 2015-01-05 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #18341 from aditya-kapoor/remove-unneeded-checks | Rafael Mendonça França | 2015-01-05 | 1 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | remove unneeded check since /_one_time_conditions/ is not present anymore. | ||||
| * | | | | remove unneeded check since /_one_time_conditions/ is removed | Aditya Kapoor | 2015-01-05 | 1 | -2/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #18342 from ↵ | Rafael Mendonça França | 2015-01-05 | 1 | -2/+4 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | brainopia/reset_template_assertion_without_warnings Reset template assertions without warnings | ||||
| * | | | Reset template assertions without warnings | brainopia | 2015-01-05 | 1 | -2/+4 |
|/ / / | |||||
* | | | Fix typo in changelog [ci skip] | Carlos Antonio da Silva | 2015-01-05 | 1 | -1/+1 |
| | | | |||||
* | | | remove deprecated support to preload instance-dependent associaitons. | Yves Senn | 2015-01-05 | 4 | -32/+16 |
| | | | | | | | | | | | | Addresses https://github.com/rails/rails/commit/ed56e596a0467390011bc9d56d462539776adac1#commitcomment-9145960 | ||||
* | | | remove deprecated support for PG ranges with exclusive lower bounds. | Yves Senn | 2015-01-05 | 3 | -37/+10 |
| | | | | | | | | | | | | addresses https://github.com/rails/rails/commit/91949e48cf41af9f3e4ffba3e5eecf9b0a08bfc3#commitcomment-9144563 | ||||
* | | | can't kill thread with in-memory db. fixes `rake test:sqlite3_mem`. | Yves Senn | 2015-01-05 | 1 | -0/+2 |
| | | |