Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #18399 from kommen/unify-structure-file-envvar-names | Rafael Mendonça França | 2015-02-05 | 3 | -4/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use `SCHEMA` instead of `DB_STRUCTURE` for specifiying structure file. | Dieter Komendera | 2015-01-08 | 3 | -4/+10 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #18589 from kamipo/fix_test_types_line_up | Rafael Mendonça França | 2015-02-05 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix `test_types_line_up` when column type missing | Ryuta Kamizono | 2015-01-30 | 1 | -2/+2 | |
* | | | | | | Merge pull request #18526 from vipulnsward/add-silence-stream | Rafael Mendonça França | 2015-02-05 | 9 | -150/+63 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | - Extracted silence_stream method to new module in activesupport/testing. | Vipul A M | 2015-01-20 | 9 | -150/+63 | |
* | | | | | | | Merge pull request #18771 from kirs/deprecate-xhr | Rafael Mendonça França | 2015-02-05 | 10 | -119/+161 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Migrating xhr methods to keyword arguments syntax | Kir Shatrov | 2015-02-01 | 10 | -119/+161 | |
* | | | | | | | | Use keyword arguments | Rafael Mendonça França | 2015-02-05 | 1 | -4/+4 | |
* | | | | | | | | Merge pull request #18747 from vipulnsward/merge-skip-callback | Rafael Mendonça França | 2015-02-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Callback#merge merges options for a callback skip instead of a callback. Rena... | Vipul A M | 2015-02-01 | 1 | -2/+2 | |
* | | | | | | | | | Do not run remove_connection in memory db test | Rafael Mendonça França | 2015-02-05 | 1 | -7/+7 | |
* | | | | | | | | | Mark some methods as nodoc | Rafael Mendonça França | 2015-02-05 | 1 | -6/+6 | |
* | | | | | | | | | Remove special case for symbols at find | Rafael Mendonça França | 2015-02-05 | 1 | -2/+0 | |
* | | | | | | | | | Merge branch 'rm-use-active-model-correctly' | Rafael Mendonça França | 2015-02-05 | 6 | -28/+103 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Rename method to make explicit its intention | Rafael Mendonça França | 2015-02-05 | 3 | -3/+3 | |
| * | | | | | | | | | Use kwags to make the argument meaning explicit | Rafael Mendonça França | 2015-02-05 | 3 | -6/+6 | |
| * | | | | | | | | | Use new hash syntax | Rafael Mendonça França | 2015-02-05 | 1 | -1/+1 | |
| * | | | | | | | | | Change the method visibility | Rafael Mendonça França | 2015-02-05 | 1 | -2/+4 | |
| * | | | | | | | | | Add tests to make sure label and placeholder respect to_model | Rafael Mendonça França | 2015-02-05 | 2 | -0/+58 | |
| * | | | | | | | | | Only check if object respond_to to_model once | Rafael Mendonça França | 2015-02-05 | 1 | -6/+2 | |
| * | | | | | | | | | placeholder doesn't exist inside this context | Rafael Mendonça França | 2015-02-05 | 1 | -2/+2 | |
| * | | | | | | | | | Merge pull request #18647 from mcls/placeholderable-to-model | Rafael Mendonça França | 2015-02-05 | 4 | -28/+47 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Reduce duplication when generating translations | Maarten Claes | 2015-01-22 | 4 | -34/+47 | |
| | * | | | | | | | | | Convert with `to_model` before calling ActiveModel methods on `object` | Maarten Claes | 2015-01-22 | 2 | -8/+14 | |
* | | | | | | | | | | | Force generated route to be inserted | Andrew White | 2015-02-05 | 3 | -1/+10 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Partial template name does no more have to be a valid Ruby identifier | Akira Matsuda | 2015-02-06 | 5 | -16/+21 | |
* | | | | | | | | | | Merge pull request #18610 from amatsuda/privatize_config_accessor | Akira Matsuda | 2015-02-06 | 3 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Privatize config_accessor as with attr_accessor | Akira Matsuda | 2015-02-06 | 3 | -0/+13 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Move ruby-head to allowed failures [ci skip] | Sean Griffin | 2015-02-05 | 1 | -0/+1 | |
* | | | | | | | | | | Merge pull request #18820 from tycooon/transaction-rollback-fix | Sean Griffin | 2015-02-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fix transaction rollback in case of aborting thread | Yuri Smirnov | 2015-02-05 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #18817 from y-yagi/fix_action_controller_gem_template | Arthur Nogueira Neves | 2015-02-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | load "rack/test" before "action_controller/railtie" in bug report templates [... | yuuji.yaginuma | 2015-02-05 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #18809 from meltheadorable/bugfix/postgres_money | Sean Griffin | 2015-02-04 | 3 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix test cases for money, bit and bit_varying | Melody | 2015-02-04 | 2 | -2/+4 | |
| * | | | | | | | | | | Add default options to 'bit' and 'bit_varying' methods | Melody | 2015-02-03 | 1 | -2/+2 | |
| * | | | | | | | | | | Adds default options hash for postgres money type | Melody Berton | 2015-02-03 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Respect custom primary keys for associations in `Relation#where` | Sean Griffin | 2015-02-04 | 4 | -2/+65 | |
* | | | | | | | | | | revert 539d929b7b32302afe548e4cb06b5f4dd56e9942 [ci skip] | Abdelkader Boudih | 2015-02-04 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #18812 from yatmsu/fix_typo_in_rails_guides | Abdelkader Boudih | 2015-02-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix typo in Creating and Customizing Rails Generators & Templates guides | Yasuhiko Katoh (y@su) | 2015-02-04 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Don't remove all line endings from routes.rb | Andrew White | 2015-02-03 | 3 | -2/+26 | |
* | | | | | | | | | rm `Column#cast_type` | Sean Griffin | 2015-02-03 | 14 | -138/+185 | |
* | | | | | | | | | Correct errors in counter cache updating | Sean Griffin | 2015-02-03 | 3 | -3/+14 | |
* | | | | | | | | | `RouteSet` should not be listed in the public API [ci skip] | Sean Griffin | 2015-02-03 | 1 | -10/+10 | |
* | | | | | | | | | Merge pull request #18801 from andreynering/fix-js-link | Eileen M. Uchitelle | 2015-02-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix link [ci skip] | Andrey Nering | 2015-02-03 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #18800 from jtperreault/master | Abdelkader Boudih | 2015-02-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ci skip] | James T. Perreault | 2015-02-03 | 1 | -1/+1 | |
| |/ / / / / / / / / |