TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
40,801 Commits 2 Branches 0 Tags 294 MiB
855ded6679
Commit Graph

40801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Angel
855ded6679 change CollectionAssociation's comments to say Association instead of AssociationProxy to match changes for 3.1 removing Association proxy. 2013-12-19 18:35:24 -08:00
Rafael Mendonça França
1f88fedd6f Merge pull request #12959 from macmartine/partial_renderer_doc_improvement 
Improve readability of sentence in partial-renderer docs [ci skip]
 2013-11-19 15:59:32 -08:00
Mac Martine
6251eb992f Improve readability of sentence in partial-renderer docs [ci skip] 2013-11-19 15:46:00 -08:00
Yves Senn
f83c9b10b4 use arel nodes to represent non-string order_values. 
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
```
 2013-11-19 17:40:21 +01:00
Rafael Mendonça França
a7afceec3e Revert "Properly require database tasks so we have access to the raised constant" 
This reverts commit fbcd46b1a0d255a34d29caa77bbd31c287446333.

This is not needed anymore. See 7280965
 2013-11-19 13:08:06 -02:00
Rafael Mendonça França
728096542a Revert "Explicitly exit with status "1" for create and drop failures" 
This reverts commit 22f80ae57b26907f662b7fd50a7270a6381e527e.

See
22f80ae57b (commitcomment-4640676)

Conflicts:
	activerecord/CHANGELOG.md
 2013-11-19 13:07:28 -02:00
Yves Senn
a6f58a535e use arel master and update activerecord to depend on arel 5.0.0. 
This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5.

> The `master` branch should use the `master` branch.
 2013-11-19 15:34:20 +01:00
Yves Senn
3053fee954 use 4-0-stable arel branch to get bundle working again. 
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'
```
 2013-11-19 14:25:37 +01:00
Rafael Mendonça França
2b18e22e9b Merge pull request #12949 from akshay-vishnoi/documentation 
[ci skip] `apropriate` => `appropriate`, spaces added
 2013-11-19 05:13:22 -08:00
Akshay Vishnoi
5190f3a05c [ci skip] apropriate => appropriate, spaces added 2013-11-19 18:09:42 +05:30
Yves Senn
be25709eff Merge pull request #12945 from fluxusfrequency/patch-1 
Fixed typos in "shallow routes" and "routing concerns" in routing.md [ci skip]
 2013-11-19 00:18:05 -08:00
Yves Senn
a3a0d087d0 Merge pull request #12942 from kuldeepaggarwal/typos 
`skiping` => `skipping` [ci skip]
 2013-11-18 23:01:04 -08:00
Ben Lewis
5019a046c6 Fixed typos in shallow routes and routing concerns 
Grammatical tense correction: "There exists two" => "There exist two".
Plurality correction: "can be reused inside others resources" => "can be reused inside other resources".
 2013-11-18 21:10:21 -07:00
Kuldeep Aggarwal
fc32b7f99b skiping => skipping 2013-11-19 03:08:08 +05:30
Yves Senn
2e9e670c0f Merge pull request #12924 from kuldeepaggarwal/f-specs 
added test cases to find notes in a file with .builder extension
 2013-11-18 06:01:35 -08:00
Yves Senn
97eae3b72b Merge pull request #12931 from yahonda/add_oracle_ignored 
Do not count query for all_constraints and all_tab_cols tested with Oracle
 2013-11-18 00:02:49 -08:00
Yasuo Honda
d7c2958a03 Do not count query for all_constraints and all_tab_cols in Oracle 2013-11-18 11:59:36 +09:00
Carlos Antonio da Silva
f60d00c56e Merge pull request #12929 from yahonda/test_merging_where_relations_add_order 
Address test_merging_where_relations failure by adding order
 2013-11-17 13:58:28 -08:00
Yasuo Honda
8e3474bede Address test_merging_where_relations failure by adding order("posts.id") 2013-11-18 02:10:56 +09:00
Carlos Antonio da Silva
ea76386493 Add description for db:create and db:drop test tasks in AR 
This will help identify these tasks exists, since they are easier to
setup things for running all AR tests.
 2013-11-17 14:25:55 -02:00
Carlos Antonio da Silva
fbcd46b1a0 Properly require database tasks so we have access to the raised constant 
Fix travis failures.
 2013-11-17 14:22:24 -02:00
Carlos Antonio da Silva
3b059e717d Merge pull request #12928 from vipulnsward/drop_unused_param 
Drop unused param `should_be_quoted` to `PostgreSQLColumn#array_to_string`
 2013-11-17 08:03:19 -08:00
Vipul A M
247c61e622 Drop unused param should_be_quoted to PostgreSQLColumn#array_to_string 2013-11-17 20:38:39 +05:30
Carlos Antonio da Silva
50b62bce2b Merge pull request #12921 from kuldeepaggarwal/documentation-updation 
[ci skip]updated documentation: added sass and less extensions
 2013-11-17 04:56:00 -08:00
Kuldeep Aggarwal
4b7fee029f added test cases to find notes in a file with .builder extension 2013-11-17 15:33:02 +05:30
Kuldeep Aggarwal
4e7d7fc863 [ci skip]updated documentation: added sass and less extensions 2013-11-17 08:14:13 +05:30
Aaron Patterson
fa13d8e6d9 rm minitest monkey patch 2013-11-16 14:33:15 -08:00
Yves Senn
07bd57385f Merge pull request #12919 from arunagw/aa-build-fix-1.9.3 
Build fix for ruby 1.9.3 syntax
 2013-11-16 14:29:38 -08:00
Aaron Patterson
8d7d2df3e2 pass the pk to compile_update 2013-11-16 14:20:22 -08:00
Arun Agrawal
e23c77f12b Build fix for ruby 1.9.3 syntax 2013-11-16 22:50:52 +01:00
Rafael Mendonça França
c069e0fa34 Merge pull request #12918 from versioncontrol/rails-12866 
Checks to see if the record contains the foreign_key to set the inverse automatically

Conflicts:
	activerecord/CHANGELOG.md
 2013-11-16 18:28:03 -02:00
Edo Balvers
02ca5580bd Checks to see if the record contains the foreign_key to set the inverse automatically 2013-11-16 21:18:02 +01:00
Rafael Mendonça França
17a0b733fd Merge pull request #12859 from jetthoughts/track_initializers_loading 
Track initializer's loaded event per file
 2013-11-16 12:01:29 -08:00
Paul Nikitochkin
251923c7a8 Instrument each load config initializer 
In order to simplify profiling loading of initializers,
added instument for tracking load config initializer event from
`config/initializers`
 2013-11-16 21:47:08 +02:00
Rafael Mendonça França
93e752cfae Merge pull request #12917 from akshay-vishnoi/refactor 
avoiding iterations and calling of underscore on all elements of array
 2013-11-16 11:37:10 -08:00
Akshay Vishnoi
7865805636 avoiding iterations and calling of underscore on all elements of array 2013-11-17 00:58:37 +05:30
Aaron Patterson
d9b6abe2b8 Merge pull request #12911 from zenspider/test_order_dependency_fixes 
Test order dependency fixes
 2013-11-16 10:42:48 -08:00
Carlos Antonio da Silva
4c76040e78 Merge pull request #12916 from petervandenabeele/typo_4_0_release_notes 
[ci skip] typo in ArgumentError in 4_0_release_notes.md
 2013-11-16 07:14:07 -08:00
Peter Vandenabeele
76d4dd6e05 [ci skip] typo in ArgumentError exception 2013-11-16 15:33:14 +01:00
Ryan Davis
456d308f47 Fix bad test order dependency between LoadAllFixturesTest#test_all_there and FoxyFixturesTest#test_ignores_belongs_to_symbols_if_association_and_foreign_key_are_named_the_same 2013-11-16 00:22:05 -08:00
Ryan Davis
8552791779 Fix bad test order dependency between test/cases/validations/i18n_generate_message_validation_test.rb and test/cases/validations/uniqueness_validation_test.rb 2013-11-16 00:12:12 -08:00
Rafael Mendonça França
38b312a86f Merge pull request #12907 from JuanitoFatas/upgrading 
[ci skip] Update gem versions for 3.2 and 3.1. Also change some words.
 2013-11-15 18:55:50 -08:00
Juanito Fatas
66e44862bd [ci skip] Update gem versions for 3.2 and 3.1. Also change some words. 2013-11-16 10:24:18 +08:00
Rafael Mendonça França
dd184e4b44 Merge pull request #12703 from makimoto/actionsupport-error-set_backtrace 
Use set_backtrace instead of @backtrace in ActionView error
 2013-11-15 18:19:20 -08:00
Rafael Mendonça França
66f1681506 Merge pull request #12904 from sbagdat/patch-1 
Change Relation#all to Relation#load [ci skip]
 2013-11-15 18:11:53 -08:00
Aaron Patterson
d5dbc037c4 test should clean up after themselves 2013-11-15 14:36:15 -08:00
Sıtkı Bağdat
324ac5f20b Change Relation#all to Relation#load [ci skip] 2013-11-15 23:31:23 +02:00
Shimpei Makimoto
1e848906c5 Use set_backtrace instead of @backtrace in ActionView error 2013-11-16 04:41:28 +09:00
Aaron Patterson
314e2cc05b Merge pull request #12779 from dougbarth/dont_swallow_exceptions_during_transactional_statements_in_mysql 
Don't swallow exceptions in transctional statements
 2013-11-15 11:29:12 -08:00
Rafael Mendonça França
8c66623627 Merge pull request #12531 from iamvery/database-tasks-exit-status 
Explicitly exit with status "1" for create and drop task failures

Conflicts:
	activerecord/CHANGELOG.md
 2013-11-15 16:59:29 -02:00