Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't duplicate `Relation::VALUE_METHODS` in `Relation::Merger` | Sean Griffin | 2015-01-24 | 1 | -2/+1 |
| | |||||
* | Merge pull request #18671 from yui-knk/fix/const_guide | Xavier Noria | 2015-01-24 | 1 | -2/+3 |
|\ | | | | | [ci skip] Fix what is pushed to nesting about eval family | ||||
| * | [ci skip] Fix what is pushed to nesting about eval family | yui-knk | 2015-01-24 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #18670 from morgoth/fix-duplicating-errors-details | Yves Senn | 2015-01-24 | 2 | -2/+3 |
|\ \ | |/ |/| | Fixed duplicating ActiveModel::Errors#details | ||||
| * | Fixed duplicating ActiveModel::Errors#details | Wojciech Wnętrzak | 2015-01-24 | 2 | -2/+3 |
| | | |||||
* | | Merge pull request #18663 from egilburg/reuse-attribute-assignment | Sean Griffin | 2015-01-24 | 3 | -5/+17 |
|\ \ | |/ |/| | Use attribute assignment module logic during ActiveModel initialization. | ||||
| * | use attribute assignment module logic during active model initialization | Eugene Gilburg | 2015-01-23 | 3 | -5/+17 |
| | | |||||
* | | Merge pull request #18474 from notEthan/pretty_print_inspect | Sean Griffin | 2015-01-23 | 2 | -0/+16 |
|\ \ | | | | | | | | | | pretty_print will use #inspect if a subclass redefines it | ||||
| * | | pretty_print will use #inspect if a subclass redefines it | Ethan | 2015-01-12 | 2 | -14/+29 |
| | | | |||||
* | | | Fix test failure on PG caused by 7c6f3938dee47f093 | Sean Griffin | 2015-01-23 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #10776 from bogdan/assign-attributes | Sean Griffin | 2015-01-23 | 10 | -60/+212 |
|\ \ | | | | | | | | | | Extracted attributes assingment from ActiveRecord to ActiveModel | ||||
| * | | ✂️ and 💅 for #10776 | Sean Griffin | 2015-01-23 | 4 | -49/+37 |
| | | | | | | | | | | | | | | | Minor style changes across the board. Changed an alias to an explicit method declaration, since the alias will not be documented otherwise. | ||||
| * | | Extracted `ActiveRecord::AttributeAssignment` to ↵ | Bogdan Gusiev | 2015-01-23 | 10 | -56/+220 |
| | | | | | | | | | | | | | | | | | | `ActiveModel::AttributesAssignment` Allows to use it for any object as an includable module. | ||||
* | | | Move integer range validation to never raise on assignment | Sean Griffin | 2015-01-23 | 4 | -20/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that this was originally added to normalize an error that would have otherwise come from the database (inconsistently), it's more natural for us to raise in `type_cast_for_database`, rather than `type_cast_from_user`. This way, things like numericality validators can handle it instead if the user chooses to do so. It also fixes an issue where assigning an out of range value would make it impossible to assign a new value later. This fixes several vague issues, none of which were ever directly reported, so I have no issue number to give. Places it was mentioned which I can remember: - https://github.com/thoughtbot/shoulda-matchers/blob/9ba21381d7caf045053a81f32df7de2f49687820/lib/shoulda/matchers/active_model/allow_value_matcher.rb#L261-L263 - https://github.com/rails/rails/issues/18653#issuecomment-71197026 | ||||
* | | | Errors raised in `type_cast_for_database` no longer raise on assignment | Sean Griffin | 2015-01-23 | 4 | -3/+29 |
| | | | | | | | | | | | | Fixes #18580. | ||||
* | | | Don't remove join dependencies in `Relation#exists?` | Sean Griffin | 2015-01-23 | 3 | -1/+13 |
| | | | | | | | | | | | | Fixes #18632 | ||||
* | | | Merge pull request #18651 from mechanicles/use-public-send | Rafael Mendonça França | 2015-01-23 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Use 'public_send' over the 'send' method for object's properties and public methods. | ||||
| * | | | Use 'public_send' over the 'send' method for object's properties. | Santosh Wadghule | 2015-01-23 | 1 | -2/+2 |
| |/ / | |||||
* / / | constants guide: make assumption explicit in an example [closes #18465] [ci ↵ | Xavier Noria | 2015-01-23 | 1 | -0/+10 |
|/ / | | | | | | | skip] | ||||
* | | Merge pull request #18643 from kaspth/renderer-normalize_keys-speedup | Rafael Mendonça França | 2015-01-22 | 1 | -9/+6 |
|\ \ | | | | | | | Speed up ActionController::Renderer `normalize_keys` by ~28%. | ||||
| * | | Speed up `normalize_keys` by removing dup step. | Kasper Timm Hansen | 2015-01-22 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Previously env was duplicated and then had it's keys mutated. This iterates through the hash twice. Using `transform_keys`, duplication and key mutation is a single iteration. `convert_symbols` was renamed to `http_header_format`. | ||||
* | | | Merge pull request #18644 from rwarbelow/fix-wording-of-css-manifest | Zachary Scott | 2015-01-22 | 2 | -6/+4 |
|\ \ \ | |/ / |/| | | fix wording of CSS manifest instructions [ci skip] | ||||
| * | | fix wording of CSS manifest instructions | Rachel Warbelow | 2015-01-22 | 2 | -6/+4 |
|/ / | |||||
* | | Merge pull request #18641 from splattael/disable-ar-jdbc-master | Rafael Mendonça França | 2015-01-22 | 1 | -1/+0 |
|\ \ | | | | | | | Disable builds AR-JDBC against master | ||||
| * | | Disable builds AR-JDBC against master | Peter Suschlik | 2015-01-22 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | Currently, bundling `activerecord-jdbc-adapter`'s master branch seems to be broken. See jruby/activerecord-jdbc-adapter#614 This commit partially reverts #12107 | ||||
* | | | Merge pull request #18642 from y-yagi/active_record_validations_guide | Abdelkader Boudih | 2015-01-22 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix regexp for validate an integer in guides [ci skip] | ||||
| * | | | fix regexp for validate an integer in guides [ci skip] | yuuji.yaginuma | 2015-01-22 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #18636 from josh/railties-remove-config-assets | Rafael Mendonça França | 2015-01-22 | 2 | -22/+1 |
|\ \ \ | | | | | | | | | Remove config.assets | ||||
| * | | | Remove config.assets | Joshua Peek | 2015-01-21 | 2 | -22/+1 |
| | | | | | | | | | | | | | | | | Provided by sprockets-rails plugin | ||||
* | | | | Merge pull request #18546 from brainopia/action_view_render | Rafael Mendonça França | 2015-01-22 | 11 | -6/+273 |
|\ \ \ \ | |_|/ / |/| | | | A shortcut to setup controller environment | ||||
| * | | | Add ApplicationController.renderer initializer [ci skip] | brainopia | 2015-01-22 | 1 | -0/+6 |
| | | | | |||||
| * | | | Add ActionController::Base.render | brainopia | 2015-01-22 | 3 | -0/+10 |
| | | | | |||||
| * | | | Add ActionController::Renderer | brainopia | 2015-01-22 | 5 | -0/+216 |
| | | | | | | | | | | | | | | | | Render arbitrary templates outside of controller actions | ||||
| * | | | Add ActionController#build_with_env | brainopia | 2015-01-22 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | To have an easier way to setup a controller instance with custom environment | ||||
| * | | | Support `:assigns` option when rendering with controllers/mailers. | brainopia | 2015-01-22 | 3 | -2/+18 |
| | | | | |||||
| * | | | Add `ActionController::Metal#set_request!` | brainopia | 2015-01-21 | 3 | -4/+17 |
| | | | | | | | | | | | | | | | | | | | | Add `ActionController::Metal#set_request!` to set a request on controller instance without calling dispatch. | ||||
* | | | | Merge pull request #18635 from ↵ | Yves Senn | 2015-01-22 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | BenMorganIO/use-two-spaces-instead-of-one-for-wrap-params use two spaces instead of one for include root in json | ||||
| * | | | | use two spaces instead of one for include root in json | Ben A Morgan | 2015-01-21 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #18637 from diogobenica/master | Arthur Nogueira Neves | 2015-01-21 | 1 | -1/+11 |
|\ \ \ \ | |/ / / |/| | | | Add :formats to options list of render documentation. | ||||
| * | | | Add :formats to options list of render documentation. | Diogo Benicá | 2015-01-21 | 1 | -1/+11 |
|/ / / | |||||
* | | | Don't error when invalid json is assigned to a JSON column | Sean Griffin | 2015-01-21 | 3 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | Keeping with our behavior elsewhere in the system, invalid input is assumed to be `nil`. Fixes #18629. | ||||
* | | | Merge pull request #18322 from morgoth/add-error-codes | Rafael Mendonça França | 2015-01-21 | 4 | -23/+154 |
|\ \ \ | | | | | | | | | Add ActiveModel::Errors#codes | ||||
| * | | | Add ActiveModel::Errors#details | Wojciech Wnętrzak | 2015-01-20 | 4 | -23/+154 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be able to return type of validator, one can now call `details` on Errors instance: ```ruby class User < ActiveRecord::Base validates :name, presence: true end ``` ```ruby user = User.new; user.valid?; user.errors.details => {name: [{error: :blank}]} ``` | ||||
* | | | | Merge pull request #18628 from yahonda/if_exists_testings | Rafael Mendonça França | 2015-01-21 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Replace `if exists` with `table_exists?` and drop table with `drop_table` | ||||
| * | | | | Replace `if exists` with `table_exists?` and drop table statement with ↵ | Yasuo Honda | 2015-01-21 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `drop_table` since 'drop table if exists' statement does not always work with some databases such as Oracle. also Oracle drop table statement will not drop sequence objects. | ||||
* | | | | | Fix test case class in the testing guide [ci skip] | Rafael Mendonça França | 2015-01-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #18626 from splattael/jruby-head | Rafael Mendonça França | 2015-01-21 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Travis: Test on jruby-head only for now | ||||
| * | | | | | Travis: Test on jruby-head only for now | Peter Suschlik | 2015-01-21 | 1 | -2/+2 |
|/ / / / / | | | | | | | | | | | | | | | | Arel head does not support 1.9 anymore. | ||||
* | | | | | Merge pull request #18619 from ↵ | Carlos Antonio da Silva | 2015-01-21 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | morgoth/add-missing-dependency-to-activemodel-naming Add missing AS core extension dependency | ||||
| * | | | | | Add missing AS core extension dependency | Wojciech Wnętrzak | 2015-01-21 | 1 | -0/+1 |
| |/ / / / |