aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Add ActionController::Rendererbrainopia2015-01-225-0/+216
| * | | | | Add ActionController#build_with_envbrainopia2015-01-221-0/+6
| * | | | | Support `:assigns` option when rendering with controllers/mailers.brainopia2015-01-223-2/+18
| * | | | | Add `ActionController::Metal#set_request!`brainopia2015-01-213-4/+17
* | | | | | Merge pull request #18635 from BenMorganIO/use-two-spaces-instead-of-one-for-...Yves Senn2015-01-221-1/+1
|\ \ \ \ \ \
| * | | | | | use two spaces instead of one for include root in jsonBen A Morgan2015-01-211-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #18637 from diogobenica/masterArthur Nogueira Neves2015-01-211-1/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add :formats to options list of render documentation.Diogo Benicá2015-01-211-1/+11
|/ / / / /
* | | | | Don't error when invalid json is assigned to a JSON columnSean Griffin2015-01-213-1/+15
* | | | | Merge pull request #18322 from morgoth/add-error-codesRafael Mendonça França2015-01-214-23/+154
|\ \ \ \ \
| * | | | | Add ActiveModel::Errors#detailsWojciech Wnętrzak2015-01-204-23/+154
* | | | | | Merge pull request #18628 from yahonda/if_exists_testingsRafael Mendonça França2015-01-212-3/+3
|\ \ \ \ \ \
| * | | | | | Replace `if exists` with `table_exists?` and drop table statement with `drop_...Yasuo Honda2015-01-212-3/+3
* | | | | | | Fix test case class in the testing guide [ci skip]Rafael Mendonça França2015-01-211-1/+1
* | | | | | | Merge pull request #18626 from splattael/jruby-headRafael Mendonça França2015-01-211-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Travis: Test on jruby-head only for nowPeter Suschlik2015-01-211-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #18619 from morgoth/add-missing-dependency-to-activemodel-...Carlos Antonio da Silva2015-01-211-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing AS core extension dependencyWojciech Wnętrzak2015-01-211-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #18621 from morgoth/error-message-on-validation-guidesCarlos Antonio da Silva2015-01-211-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add missing options to Error Message Interpolation guide [CI skip]Wojciech Wnętrzak2015-01-211-1/+2
| |/ / / / /
* | | | | | Merge pull request #18620 from mechanicles/change-a-to-anXavier Noria2015-01-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change 'a' to 'an' for 'attribute' word [ci skip]Santosh Wadghule2015-01-211-1/+1
|/ / / / /
* / / / / Introduce `ActiveRecord::Base#accessed_fields`Sean Griffin2015-01-207-1/+88
|/ / / /
* | | | Merge pull request #18557 from tjschuck/sanitize_doc_fixesRafael Mendonça França2015-01-201-76/+51
|\ \ \ \
| * | | | Single instead of double quotes T.J. Schuck2015-01-201-2/+2
| * | | | Rewrite SanitizeHelper docsT.J. Schuck2015-01-201-77/+50
| * | | | Fix code formatting in sanitize docsT.J. Schuck2015-01-201-9/+11
|/ / / /
* | | | Merge pull request #18614 from arthurnn/rollback_records_parityRafael Mendonça França2015-01-202-6/+6
|\ \ \ \
| * | | | TransactionManager should call rollback recordsArthur Neves2015-01-202-6/+6
|/ / / /
* | | | Merge pull request #18458 from brainopia/fix_after_commit_for_fixturesJeremy Kemper2015-01-205-22/+51
|\ \ \ \
| * | | | after_commit runs after transactions with non-joinable parentsbrainopia2015-01-165-22/+51
* | | | | tests, use `drop_table if_exists: true` in our test suite.Yves Senn2015-01-209-13/+13
* | | | | Merge pull request #18597 from kamipo/add-if-exists-to-drop-tableYves Senn2015-01-205-3/+29
|\ \ \ \ \
| * | | | | Add an `:if_exists` option to `drop_table`Stefan Kanev2015-01-195-3/+29
* | | | | | Fix bind value copying from subqueried relationsSean Griffin2015-01-193-13/+10
* | | | | | Move `create_binds` over to the `PredicateBuilder`Sean Griffin2015-01-193-34/+31
* | | | | | Whether a column exists or not doesn't affect whether we can use bindsSean Griffin2015-01-192-7/+4
* | | | | | Don't mutate bind values in `Relation`Sean Griffin2015-01-192-2/+1
* | | | | | Merge pull request #18450 from tonytonyjan/patch-1Rafael Mendonça França2015-01-191-0/+2
|\ \ \ \ \ \
| * | | | | | fix dependencyJian Weihang2015-01-121-0/+2
* | | | | | | Merge pull request #18593 from prathamesh-sonpatki/ar-changelogYves Senn2015-01-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix wording in AR CHANGELOG about time columns change [ci skip]Prathamesh Sonpatki2015-01-191-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #18594 from prathamesh-sonpatki/use-force-true-in-templatesYves Senn2015-01-192-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Use force: true options for creating tables in bug templatesPrathamesh Sonpatki2015-01-192-4/+4
| |/ / / / / /
* | | | | | | Merge pull request #18600 from y-yagi/fix_number_field_tag_exampleAbdelkader Boudih2015-01-191-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix typo in number_field_tag documentation [ci skip]yuuji.yaginuma2015-01-191-2/+2
|/ / / / / /
* | | | | | Merge pull request #18483 from rono23/fix-name_for_action-in-routingSantiago Pastorino2015-01-192-2/+41
|\ \ \ \ \ \
| * | | | | | Fix name_for_action in routingrono232015-01-192-2/+41
* | | | | | | Merge pull request #18380 from nobu/Use-EXEEXTSantiago Pastorino2015-01-191-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Use EXEEXTNobuyoshi Nakada2015-01-071-1/+3