mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
40,465 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

40465 Commits

Author SHA1 Message Date
laurocaetano d48222d22e remove warnings on ruby trunk 2013-11-01 18:15:53 -02:00
Rafael Mendonça França a221b30b3f Test with the right association 2013-11-01 14:26:05 -02:00
Rafael Mendonça França 9616a7ee1a Merge pull request #12733 from robin850/fix-railties-build 
Fix railties build
 2013-11-01 08:23:06 -07:00
Rafael Mendonça França f8483dd48b Merge pull request #12735 from linstula/fix-typo-in-responder-comment 
Fix typo in method description in Responder class
 2013-11-01 08:18:54 -07:00
Rafael Mendonça França fe64edec3d Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunk 
More Warnings removed for ruby trunk
 2013-11-01 08:10:48 -07:00
Lin Reid 56d3862541 Fix typo in method description in Responder class 
Fixes a typo in the description for the call class method in Responder.
 2013-11-01 10:58:25 -04:00
Rafael Mendonça França 09ce1df7aa 💣 2013-11-01 11:59:47 -02:00
Rafael Mendonça França fe21c8589f Use consistent order of the arguments 2013-11-01 11:58:40 -02:00
Robin Dupret bca36b080b Fix some failing tests for Rails::Paths 
Since we are not using the File.exists? alias which raises a warning on
current ruby trunk, few stubs are wrong.
 2013-11-01 14:42:12 +01:00
Robin Dupret 1a566c87cb Set the destination_root for plugins 
Since the plugin generator is relying on the application one, we need to
define the proper root when creating the plugin. The AppBase class is
not setting the destination_root (this is done via the AppGenerator)
 2013-11-01 14:40:29 +01:00
Arun Agrawal dbdb25463c shadowing variable warning removed 2013-11-01 13:47:23 +01:00
Arun Agrawal c10a78124c More Warnings removed for ruby trunk 
Same as 4d4ff531b8
 2013-11-01 13:47:23 +01:00
Rafael Mendonça França 026b6daa05 Merge pull request #12729 from arunagw/build-fixed-ruby193 
Can't used named argument in ruby 1.9.3
 2013-11-01 05:45:21 -07:00
Arun Agrawal e42fb393c2 Passing args for gemfile entry 
Fixing build
 2013-11-01 13:44:49 +01:00
Rafael Mendonça França 2b022bde4b Merge pull request #12732 from razielgn/additional-rbx-dep 
Added rubysl-rexml to Rubinius deps.
 2013-11-01 05:17:53 -07:00
Robin Dupret b79e4223f7 Remove "circular require considered harmful" error 
rails/generators should not load rails/generators/base since the
latter is loading it.
 2013-11-01 11:41:02 +01:00
Federico Ravasio ae27dd6aff Added rubysl-rexml to Rubinius deps. 2013-11-01 11:25:10 +01:00
Santiago Pastorino 2e7ee652d2 Merge pull request #12727 from arunagw/aa-warnings-removed-ruby-trunk 
Warnings removed for ruby trunk
 2013-11-01 02:13:15 -07:00
Arun Agrawal 816126862e Warnings removed for ruby trunk 
Same as 4d4ff531b8
 2013-11-01 09:49:57 +01:00
Yves Senn 1adcebdb58 Merge pull request #12713 from utenmiki/document 
Add Rdoc document for Array#forty_two [ci skip]
 2013-11-01 01:01:32 -07:00
Rafael Mendonça França aaedb1a2e8 Merge pull request #12722 from razielgn/update-travis-rbx 
Updated Rubinius on Travis to 2.1.1
 2013-10-31 15:18:24 -07:00
Aaron Patterson 3f2230b9ec gemfile entries can be added to the app builder 2013-10-31 14:59:56 -07:00
Federico Ravasio 6bb56b2c19 Added Rubinius 2 specific dependencies. 2013-10-31 21:21:48 +01:00
Federico Ravasio f960362f74 Updated Rubinius version to 2.1.1 2013-10-31 21:08:40 +01:00
Aaron Patterson 90ace1b986 forgot to add the test. orz 😢 2013-10-31 11:48:12 -07:00
Aaron Patterson 4d4ff531b8 clean up some warnings on trunk ruby 2013-10-31 11:47:51 -07:00
Aaron Patterson f7e0758714 add filters for gemfile entries 2013-10-31 11:46:11 -07:00
Aaron Patterson ae221d4ef9 Merge pull request #12712 from robin850/fix-build 
Require time before monkey-patching it
 2013-10-31 10:14:15 -07:00
Rafael Mendonça França 1428131f64 Merge pull request #12107 from kares/master 
allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
 2013-10-31 10:05:02 -07:00
Rafael Mendonça França bdd518343e Merge pull request #12704 from JuanitoFatas/routing 
[ci skip] Add actions to shallow table, change a tense in sentence, add
 2013-10-31 07:53:01 -07:00
Rafael Mendonça França 96abcb9aca Merge pull request #12714 from jlecour/patch-1 
Fix typo in the CHANGELOG
 2013-10-31 07:33:21 -07:00
Jérémy Lecour cdf74eb5a0 Fix typo in the CHANGELOG 2013-10-31 15:29:16 +01:00
utenmiki 3f79d84230 Add Rdoc document for Array#forty_two 2013-10-31 23:20:15 +09:00
Robin Dupret e3d775f00a Require time before monkey-patching it 
Same as #12710 but for the time module this time. This time it should
fix the Active Model test suite in isolation avoiding a TypeError to
be raised about the superclass of the DateTime object.
 2013-10-31 13:46:23 +01:00
Xavier Noria cc2a9df970 AS guide: errata 2013-10-31 12:35:08 +01:00
Xavier Noria 7c537110d6 Merge pull request #12710 from robin850/fix-build 
Require bigdecimal before monkey-patching it
 2013-10-31 04:33:04 -07:00
Robin Dupret 9d6d07ddf4 Require bigdecimal before monkey-patching it 
If we try to monkey-patch the class before requiring it, then a
"superclass mismatch" (TypeError) error is raised and the build can't
run correctly.

Fixes #12708
 2013-10-31 12:19:48 +01:00
Juanito Fatas 5059769a35 [ci skip] Make all tables have Controller#Action, change a tense in sentence. 2013-10-31 18:45:09 +08:00
Guillermo Iguaran 6e5d409f65 Merge pull request #12706 from RobZolkos/master 
show javascripts can be disabled in scaffold generator
 2013-10-30 20:09:55 -07:00
Rob Zolkos 2527ce70c5 show javascripts can be disabled in generators 2013-10-31 14:03:57 +11:00
Aaron Patterson 02d4912d1c We need to fix Sam Ruby's tests. 
Revert "always call set_default_accessors from create_root"

This reverts commit faa1b82bf2.
 2013-10-30 17:38:07 -07:00
Aaron Patterson 1df1877b74 golf down rc file reading 2013-10-30 16:53:40 -07:00
Aaron Patterson 9bc99b4fe5 add a test for whitespace separated args in the rc file 2013-10-30 16:53:08 -07:00
Aaron Patterson b0645ea04c avoid object creation if there is no rc file 2013-10-30 16:51:07 -07:00
Aaron Patterson f7ae6e1cd6 no need to dup, argv is never mutated 2013-10-30 16:47:51 -07:00
Aaron Patterson 960dd86024 no need to shift 2013-10-30 16:46:58 -07:00
Aaron Patterson bda6d6c227 functionally build the argv 2013-10-30 16:46:17 -07:00
Aaron Patterson 19ca0952bb there is no reason for ARGV[0] to be nil 2013-10-30 16:37:33 -07:00
Aaron Patterson 36ea8e6a3b return argv from the insert method 2013-10-30 16:33:39 -07:00
Aaron Patterson 22dafbb658 return argv from more methods 2013-10-30 16:25:51 -07:00