Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17816 from byroot/prevent-numeric-to-s-to-allocate-an-array | Rafael Mendonça França | 2014-11-29 | 2 | -16/+25 |
|\ | | | | | Prevent Numeric#to_s from allocating an array | ||||
| * | Prevent Numeric#to_s from allocating an array | Jean Boussier | 2014-11-28 | 2 | -16/+25 |
| | | |||||
* | | Merge pull request #17830 from claudiob/bump-required-ruby-version | Rafael Mendonça França | 2014-11-29 | 9 | -11/+11 |
|\ \ | | | | | | | Bump required Ruby version to 2.1.0 | ||||
| * | | Bump required Ruby version to 2.1.0 | claudiob | 2014-11-28 | 9 | -11/+11 |
|/ / | | | | | | | | | | | | | | | | | [This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0) states that: > Rails 5.0 is in most likelihood going to target Ruby 2.2. Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383) that **at least** version 2.1.0 **must** be required by the `gemspec` files. | ||||
* | | Merge pull request #17838 from claudiob/remove-ruby19-reference-in-guides | Arthur Nogueira Neves | 2014-11-28 | 1 | -1/+1 |
|\ \ | | | | | | | Remove a reference to Ruby 1.9 in Guides | ||||
| * | | Remove a reference to Ruby 1.9 in Guides | claudiob | 2014-11-28 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | [ci skip] Now that Rails requires Ruby >= 2.0 there is no need to document Ruby 1.9. | ||||
* | | Merge pull request #17828 from yui-knk/fix/i18n_guide | Zachary Scott | 2014-11-28 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] fix class name | ||||
| * | | [ci skip] fix class name | yui-knk | 2014-11-29 | 1 | -1/+1 |
|/ / | |||||
* | | Allow failures with Active Job integration tests | Rafael Mendonça França | 2014-11-28 | 1 | -0/+1 |
| | | |||||
* | | Allow failures with Active Job | Rafael Mendonça França | 2014-11-28 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #17818 from bigtone1284/edits_refactor_cop | Rafael Mendonça França | 2014-11-28 | 1 | -1/+1 |
|\ \ | | | | | | | fixed indent of end in jdom.rb | ||||
| * | | fixed indent of end in jdom.rb | bigtone1284 | 2014-11-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #17799 from kamipo/refactor_add_column_options | Rafael Mendonça França | 2014-11-28 | 2 | -6/+14 |
|\ \ \ | | | | | | | | | Refactor `add_column_options!`, to move the quoting of default value for :uuid in `quote_value`. | ||||
| * | | | Rename to `quote_default_expression` from `quote_value` | Ryuta Kamizono | 2014-11-28 | 2 | -3/+3 |
| | | | | |||||
| * | | | Refactor `add_column_options!`, to move the quoting of default value for ↵ | Ryuta Kamizono | 2014-11-28 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | :uuid in `quote_value`. | ||||
* | | | | Use jquery-rails master to resolve dependencies | Rafael Mendonça França | 2014-11-28 | 1 | -2/+2 |
| |/ / |/| | | | | | | | | delayed_job_active_record doesn't allow Rails 5 yet | ||||
* | | | We don't need to use sass-rails 5.0.0.beta | Rafael Mendonça França | 2014-11-28 | 1 | -2/+1 |
| | | | |||||
* | | | Start Rails 5 development :tada: | Rafael Mendonça França | 2014-11-28 | 20 | -2746/+37 |
| |/ |/| | | | | | | | | | | | We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9. | ||||
* | | Merge pull request #17812 from jonatack/patch-8 | Abdelkader Boudih | 2014-11-28 | 1 | -19/+19 |
|\ \ | | | | | | | 4.2 release notes pass [skip ci] | ||||
| * | | 4.2 release notes pass [skip ci] | Jon Atack | 2014-11-28 | 1 | -19/+19 |
| | | | |||||
* | | | Merge pull request #17811 from mrnugget/fixes_nested_association_preloading | Santiago Pastorino | 2014-11-28 | 2 | -0/+9 |
|\ \ \ | |/ / |/| | | Adds preloaded_records method to NullPreloader - fixes #16070 | ||||
| * | | Adds preloaded_records method to NullPreloader | Thorsten Ball | 2014-11-28 | 2 | -0/+9 |
|/ / | | | | | | | | | | | | | | | This fixes a regression where preloading association throws an exception if one of the associations in the preloading hash doesn't exist for one record. Fixes #16070 | ||||
* | | Merge pull request #17808 from ↵ | Rafael Mendonça França | 2014-11-28 | 5 | -12/+31 |
|\ \ | | | | | | | | | | | | | yuki24/fix-bug-where-record-not-saved-loses-error-message Fixed a bug where AR::RecordNotSaved loses the given error message | ||||
| * | | Fix a bug where AR::RecordNotSaved loses error messages | Yuki Nishijima | 2014-11-27 | 5 | -12/+31 |
| |/ | | | | | | | | | | | Since 3e30c5d, it started ignoring the given error message. This commit changes the behavior of AR::RecordNotSaved#initialize so that it no longer loses the given error message. | ||||
* | | Merge pull request #17809 from iainbeeston/remove_ecosystem_from_guides | Xavier Noria | 2014-11-28 | 0 | -0/+0 |
|\ \ | | | | | | | Remove ecosystem link from guides | ||||
| * | | Removed ecosystem link from the header of the guides pages | Iain Beeston | 2014-11-28 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #17798 from kamipo/refactor_visit_add_column | Yves Senn | 2014-11-28 | 2 | -9/+1 |
|\ \ \ | | | | | | | | | Refactor `SchemaCreation#visit_AddColumn` | ||||
| * | | | Refactor `SchemaCreation#visit_AddColumn` | Ryuta Kamizono | 2014-11-27 | 2 | -9/+1 |
| | | | | |||||
* | | | | docs, AR no longer makes use of `test:prepare`. [ci skip] | Yves Senn | 2014-11-28 | 1 | -1/+2 |
| |_|/ |/| | | | | | | | | | | | | | | Change originated from https://github.com/rails/rails/pull/17739#issuecomment-64829088 /cc @metaskills | ||||
* | | | Merge pull request #17807 from jvperrin/correct-integer-test | Rafael Mendonça França | 2014-11-27 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Correct test description for large integer test | ||||
| * | | | Correct test description for large integer test | Jason Perrin | 2014-11-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | release notes: edit pass [ci skip] | Xavier Noria | 2014-11-27 | 1 | -19/+17 |
| | | | | |||||
* | | | | release notes: iteration over the description of Global ID [ci skip] | Xavier Noria | 2014-11-27 | 1 | -4/+14 |
| | | | | |||||
* | | | | Bump to rack 1.6.0.beta2 | Santiago Pastorino | 2014-11-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Revert "Test against rack master" | Santiago Pastorino | 2014-11-27 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | This reverts commit 2a4e14db981e38611667d407a975600ee720ada7. | ||||
* | | | | Merge pull request #17803 from sadfuzzy/patch-2 | Abdelkader Boudih | 2014-11-27 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Update cookies.rb Conflicts: actionpack/lib/action_dispatch/middleware/cookies.rb | ||||
* | | | | Merge pull request #17802 from aar0nTw/remove-dependent-with-through-note | Rafael Mendonça França | 2014-11-27 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Remove outdate note of :dependent in guide | ||||
| * | | | | [ci skip] Remove outdate note of :dependent | Aaron Huang | 2014-11-28 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | Merge pull request #17801 from jonatack/patch-8 | Rafael Mendonça França | 2014-11-27 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Clarification follow-up to e2cce6c [ci skip] | ||||
| * | | | | Follow-up to e2cce6c | Jon Atack | 2014-11-27 | 1 | -2/+2 |
|/ / / / | | | | | | | | | [skip ci] | ||||
* | | | | Fix CHANGELOG typo introduced in e2cce6cd [ci skip] | Zachary Scott | 2014-11-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #17800 from jonatack/patch-8 | Zachary Scott | 2014-11-27 | 1 | -22/+21 |
|\ \ \ \ | | | | | | | | | | | Action Mailer change log pass [ci skip] | ||||
| * | | | | Action Mailer change log pass | Jon Atack | 2014-11-27 | 1 | -22/+21 |
| | | | | | | | | | | | | | | | [skip ci] | ||||
* | | | | | Update the StatementCache documentation | Rafael Mendonça França | 2014-11-27 | 1 | -4/+15 |
|/ / / / | |||||
* | | | | StatementCache is private API | Rafael Mendonça França | 2014-11-27 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | It should not be used in applications | ||||
* | | | | updates some pointers in the guides welcome section [ci skip] | Xavier Noria | 2014-11-27 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | rails -> bin/rails in index.html | Xavier Noria | 2014-11-27 | 1 | -1/+1 |
| | | | |||||
* | | | removes double mention of deliver_now | Xavier Noria | 2014-11-27 | 1 | -4/+0 |
| | | | |||||
* | | | edits in the release notes for 4.2 | Xavier Noria | 2014-11-27 | 1 | -12/+22 |
| | | | |||||
* | | | Merge pull request #17796 from leafac/fix-format | Yves Senn | 2014-11-27 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | | | | | Fix format "Form Helpers" guide |