Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| | | | | | | | | | | | | Closes #12831 | |||||
* | | | 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] | |||||
| * | | | 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 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug when merging relations of different classes. ``` Given: Post.joins(:author).merge(Author.order(name: :desc)).to_sql Before: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "posts"."name" DESC After: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "authors"."name" DESC ``` | |||||
* | | | Revert "Properly require database tasks so we have access to the raised ↵ | Rafael Mendonça França | 2013-11-19 | 3 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | constant" This reverts commit fbcd46b1a0d255a34d29caa77bbd31c287446333. This is not needed anymore. See 7280965 | |||||
* | | | Revert "Explicitly exit with status "1" for create and drop failures" | Rafael Mendonça França | 2013-11-19 | 6 | -51/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 22f80ae57b26907f662b7fd50a7270a6381e527e. See https://github.com/rails/rails/commit/22f80ae57b26907f662b7fd50a7270a6381e527e#commitcomment-4640676 Conflicts: activerecord/CHANGELOG.md | |||||
* | | | use arel `master` and update activerecord to depend on arel `5.0.0`. | Yves Senn | 2013-11-19 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5. > The `master` branch should use the `master` branch. | |||||
* | | | use `4-0-stable` arel branch to get bundle working again. | Yves Senn | 2013-11-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this resolves the following error when running `bundle install` ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ``` The build is still broken with lots of: ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ``` | |||||
* | | | 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 | |||||
| * | | [ci skip] `apropriate` => `appropriate`, spaces added | Akshay Vishnoi | 2013-11-19 | 1 | -19/+19 | |
|/ / | ||||||
* | | Merge pull request #12945 from fluxusfrequency/patch-1 | Yves Senn | 2013-11-19 | 1 | -2/+2 | |
|\ \ | | | | | | | Fixed typos in "shallow routes" and "routing concerns" in routing.md [ci skip] | |||||
| * | | Fixed typos in shallow routes and routing concerns | Ben Lewis | 2013-11-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | Grammatical tense correction: "There exists two" => "There exist two". Plurality correction: "can be reused inside others resources" => "can be reused inside other resources". | |||||
* | | | Merge pull request #12942 from kuldeepaggarwal/typos | Yves Senn | 2013-11-18 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | `skiping` => `skipping` [ci skip] | |||||
| * | | `skiping` => `skipping` | Kuldeep Aggarwal | 2013-11-19 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #12924 from kuldeepaggarwal/f-specs | Yves Senn | 2013-11-18 | 1 | -1/+3 | |
|\ \ | | | | | | | added test cases to find notes in a file with .builder extension | |||||
| * | | added test cases to find notes in a file with .builder extension | Kuldeep Aggarwal | 2013-11-17 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge pull request #12931 from yahonda/add_oracle_ignored | Yves Senn | 2013-11-18 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Do not count query for all_constraints and all_tab_cols tested with Oracle | |||||
| * | | | Do not count query for all_constraints and all_tab_cols in Oracle | Yasuo Honda | 2013-11-18 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #12929 from yahonda/test_merging_where_relations_add_order | Carlos Antonio da Silva | 2013-11-17 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Address test_merging_where_relations failure by adding order | |||||
| * | | | Address test_merging_where_relations failure by adding `order("posts.id")` | Yasuo Honda | 2013-11-18 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Add description for db:create and db:drop test tasks in AR | Carlos Antonio da Silva | 2013-11-17 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | This will help identify these tasks exists, since they are easier to setup things for running all AR tests. | |||||
* | | | Properly require database tasks so we have access to the raised constant | Carlos Antonio da Silva | 2013-11-17 | 3 | -0/+3 | |
| | | | | | | | | | | | | Fix travis failures. | |||||
* | | | Merge pull request #12928 from vipulnsward/drop_unused_param | Carlos Antonio da Silva | 2013-11-17 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string` | |||||
| * | | | Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string` | Vipul A M | 2013-11-17 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge pull request #12921 from kuldeepaggarwal/documentation-updation | Carlos Antonio da Silva | 2013-11-17 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | [ci skip]updated documentation: added sass and less extensions | |||||
| * | | [ci skip]updated documentation: added sass and less extensions | Kuldeep Aggarwal | 2013-11-17 | 1 | -1/+1 | |
|/ / | ||||||
* | | rm minitest monkey patch | Aaron Patterson | 2013-11-16 | 1 | -17/+0 | |
| | | ||||||
* | | Merge pull request #12919 from arunagw/aa-build-fix-1.9.3 | Yves Senn | 2013-11-16 | 1 | -1/+1 | |
|\ \ | | | | | | | Build fix for ruby 1.9.3 syntax | |||||
| * | | Build fix for ruby 1.9.3 syntax | Arun Agrawal | 2013-11-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | pass the pk to compile_update | Aaron Patterson | 2013-11-16 | 3 | -3/+6 | |
|/ / | ||||||
* | | Merge pull request #12918 from versioncontrol/rails-12866 | Rafael Mendonça França | 2013-11-16 | 3 | -1/+14 | |
|\ \ | | | | | | | | | | | | | | | | | | | Checks to see if the record contains the foreign_key to set the inverse automatically Conflicts: activerecord/CHANGELOG.md | |||||
| * | | Checks to see if the record contains the foreign_key to set the inverse ↵ | Edo Balvers | 2013-11-16 | 3 | -1/+14 | |
| | | | | | | | | | | | | automatically | |||||
* | | | Merge pull request #12859 from jetthoughts/track_initializers_loading | Rafael Mendonça França | 2013-11-16 | 4 | -1/+59 | |
|\ \ \ | | | | | | | | | Track initializer's loaded event per file | |||||
| * | | | Instrument each load config initializer | Paul Nikitochkin | 2013-11-16 | 4 | -1/+59 | |
|/ / / | | | | | | | | | | | | | | | | In order to simplify profiling loading of initializers, added instument for tracking load config initializer event from `config/initializers` | |||||
* | | | Merge pull request #12917 from akshay-vishnoi/refactor | Rafael Mendonça França | 2013-11-16 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | avoiding iterations and calling of underscore on all elements of array | |||||
| * | | | avoiding iterations and calling of underscore on all elements of array | Akshay Vishnoi | 2013-11-17 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #12911 from zenspider/test_order_dependency_fixes | Aaron Patterson | 2013-11-16 | 2 | -14/+26 | |
|\ \ \ \ | |/ / / |/| | | | Test order dependency fixes | |||||
| * | | | Fix bad test order dependency between LoadAllFixturesTest#test_all_there and ↵ | Ryan Davis | 2013-11-16 | 1 | -6/+10 | |
| | | | | | | | | | | | | | | | | FoxyFixturesTest#test_ignores_belongs_to_symbols_if_association_and_foreign_key_are_named_the_same | |||||
| * | | | Fix bad test order dependency between ↵ | Ryan Davis | 2013-11-16 | 1 | -8/+16 | |
| | | | | | | | | | | | | | | | | test/cases/validations/i18n_generate_message_validation_test.rb and test/cases/validations/uniqueness_validation_test.rb | |||||
* | | | | Merge pull request #12916 from petervandenabeele/typo_4_0_release_notes | Carlos Antonio da Silva | 2013-11-16 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | [ci skip] typo in ArgumentError in 4_0_release_notes.md | |||||
| * | | | | [ci skip] typo in ArgumentError exception | Peter Vandenabeele | 2013-11-16 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #12907 from JuanitoFatas/upgrading | Rafael Mendonça França | 2013-11-15 | 1 | -9/+10 | |
|\ \ \ \ | | | | | | | | | | | [ci skip] Update gem versions for 3.2 and 3.1. Also change some words. | |||||
| * | | | | [ci skip] Update gem versions for 3.2 and 3.1. Also change some words. | Juanito Fatas | 2013-11-16 | 1 | -9/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #12703 from makimoto/actionsupport-error-set_backtrace | Rafael Mendonça França | 2013-11-15 | 3 | -2/+13 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use set_backtrace instead of @backtrace in ActionView error | |||||
| * | | | | | Use `set_backtrace` instead of `@backtrace` in ActionView error | Shimpei Makimoto | 2013-11-16 | 3 | -2/+13 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #12904 from sbagdat/patch-1 | Rafael Mendonça França | 2013-11-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Change Relation#all to Relation#load [ci skip] | |||||
| * | | | | | Change Relation#all to Relation#load [ci skip] | Sıtkı Bağdat | 2013-11-15 | 1 | -1/+1 | |
| |/ / / / | ||||||
* / / / / | test should clean up after themselves | Aaron Patterson | 2013-11-15 | 1 | -0/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #12779 from ↵ | Aaron Patterson | 2013-11-15 | 4 | -10/+10 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | dougbarth/dont_swallow_exceptions_during_transactional_statements_in_mysql Don't swallow exceptions in transctional statements |