| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | Merge pull request #12774 from exAspArk/fix_uniqueness_on_relation | Yves Senn | 2013-11-22 | 3 | -1/+24 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Fix validation on uniqueness of empty association | Evgeny Li | 2013-11-22 | 3 | -1/+24 |
|/ / / / |
|
* | | | | Use a more generic assertion to make sure this tests will be useful. | Rafael Mendonça França | 2013-11-22 | 1 | -3/+2 |
* | | | | Merge pull request #13003 from laurocaetano/fix_assertion_for_turbolinks | Rafael Mendonça França | 2013-11-22 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Fix the assertion for not inclusion of turbolinks on application.js. | Lauro Caetano | 2013-11-22 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Improve changelogs | Carlos Antonio da Silva | 2013-11-22 | 4 | -11/+13 |
* | | | | Merge pull request #13000 from arunagw/build-fix-rake-test | Yves Senn | 2013-11-21 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Build fix for new routing inspector changes | Arun Agrawal | 2013-11-22 | 1 | -2/+2 |
|/ / / / |
|
* | | | | Merge pull request #12996 from shreve/patch-2 | Guillermo Iguaran | 2013-11-21 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Added a missing close parenthesis to i18n.md | Jacob Evan Shreve | 2013-11-21 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge pull request #12993 from laurocaetano/skip_turbolinks | Rafael Mendonça França | 2013-11-21 | 4 | -4/+21 |
|\ \ \ \ |
|
| * | | | | Remove turbolinks when generating a new application based on a template | Lauro Caetano | 2013-11-21 | 4 | -4/+21 |
|/ / / / |
|
* | | | | Merge pull request #12994 from sbagdat/fix_for_info_title | Rafael Mendonça França | 2013-11-21 | 2 | -1/+3 |
|\ \ \ \ |
|
| * | | | | Fix for titles of info pages | Sıtkı Bağdat | 2013-11-22 | 2 | -1/+3 |
* | | | | | Merge pull request #12992 from arunagw/build-fix-routing-inspector | Rafael Mendonça França | 2013-11-21 | 1 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | Build fix for Routing Inspector | Arun Agrawal | 2013-11-22 | 1 | -2/+2 |
|/ / / / / |
|
* | | | | | Revert "Merge pull request #12990 from vipulnsward/remove_visualizer_param" | Rafael Mendonça França | 2013-11-21 | 1 | -1/+1 |
* | | | | | Merge pull request #12990 from vipulnsward/remove_visualizer_param | Rafael Mendonça França | 2013-11-21 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Remove unused param `title`to `TransitionTable#visualizer` | Vipul A M | 2013-11-22 | 1 | -1/+1 |
|/ / / / / |
|
* | | | | | Merge pull request #12962 from kamipo/call_initialize_schema_migrations_table... | Xavier Noria | 2013-11-21 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Use `SchemaStatements#initialize_schema_migrations_table` instead of `ActiveR... | Ryuta Kamizono | 2013-11-20 | 1 | -1/+1 |
* | | | | | | unify punctuation in Action Pack changelog. [ci skip] | Yves Senn | 2013-11-21 | 1 | -5/+7 |
* | | | | | | Merge pull request #12975 from sbagdat/fix-for-rake-routes | Yves Senn | 2013-11-21 | 4 | -19/+24 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | Fix for routes task | Sıtkı Bağdat | 2013-11-21 | 4 | -19/+24 |
* | | | | | | doc `travel` and `travel_to` stubs are removed in teardown. [ci skip] | Yves Senn | 2013-11-21 | 1 | -4/+4 |
* | | | | | | replace custom Time stubbing with `travel` and `travel_to`. | Yves Senn | 2013-11-21 | 1 | -37/+7 |
* | | | | | | Merge pull request #12970 from prathamesh-sonpatki/issue12885 | Carlos Antonio da Silva | 2013-11-21 | 1 | -1/+1 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add positional information to eval call so that this information will | Prathamesh Sonpatki | 2013-11-20 | 1 | -1/+1 |
* | | | | | | | Merge pull request #12986 from budnik/fix-unicode-nbsp | Carlos Antonio da Silva | 2013-11-21 | 4 | -9/+9 |
|\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | | |
|
| * | | | | | | replace U+00A0 with whitespace | Dmitriy Budnik | 2013-11-21 | 4 | -9/+9 |
|/ / / / / / |
|
* | | | | | | Merge pull request #12976 from tmm1/faster-blank | Xavier Noria | 2013-11-20 | 1 | -1/+1 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Expand double-negative in String#blank? regex | Aman Gupta | 2013-11-20 | 1 | -1/+1 |
|/ / / / / |
|
* / / / / | Fix ActiveRecord::Relation#unscope | Jon Leighton | 2013-11-20 | 8 | -23/+45 |
|/ / / / |
|
* | | | | swap arguments for some `assert_equal` statements => `expected, actual` | Yves Senn | 2013-11-20 | 1 | -6/+6 |
* | | | | Merge pull request #12824 from sikachu/ps-testing-time-helper | Xavier Noria | 2013-11-20 | 4 | -2/+144 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Add `#travel` and `#travel_to` to AS::TestCase | Prem Sichanugrist | 2013-11-20 | 4 | -2/+144 |
|/ / / |
|
* | | | Merge pull request #12961 from jbaudanza/doc | Rafael Mendonça França | 2013-11-19 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Update caching guide with respect to :namespace | Jonathan Baudanza | 2013-11-19 | 1 | -1/+1 |
|/ / / |
|
* | | | _implied_layout_name should be private | Rafael Mendonça França | 2013-11-19 | 1 | -9/+11 |
* | | | Use the right indentation | Rafael Mendonça França | 2013-11-19 | 1 | -1/+1 |
* | | | Renderer#_render_template should be private | Rafael Mendonça França | 2013-11-19 | 1 | -7/+7 |
* | | | Merge pull request #12959 from macmartine/partial_renderer_doc_improvement | Rafael Mendonça França | 2013-11-19 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Improve readability of sentence in partial-renderer docs [ci skip] | Mac Martine | 2013-11-19 | 1 | -1/+1 |
* | | | | use arel nodes to represent non-string `order_values`. | Yves Senn | 2013-11-19 | 4 | -24/+28 |
|/ / / |
|
* | | | Revert "Properly require database tasks so we have access to the raised const... | Rafael Mendonça França | 2013-11-19 | 3 | -3/+0 |
* | | | Revert "Explicitly exit with status "1" for create and drop failures" | Rafael Mendonça França | 2013-11-19 | 6 | -51/+16 |
* | | | use arel `master` and update activerecord to depend on arel `5.0.0`. | Yves Senn | 2013-11-19 | 2 | -2/+2 |
* | | | use `4-0-stable` arel branch to get bundle working again. | Yves Senn | 2013-11-19 | 1 | -1/+1 |
* | | | Merge pull request #12949 from akshay-vishnoi/documentation | Rafael Mendonça França | 2013-11-19 | 1 | -19/+19 |
|\ \ \
| | |/
| |/| |
|
| * | | [ci skip] `apropriate` => `appropriate`, spaces added | Akshay Vishnoi | 2013-11-19 | 1 | -19/+19 |
|/ / |
|