Commit Graph

8467 Commits

Author SHA1 Message Date
José Valim
5e7d6bba79 Revert "Allow loading external route files from the router"
This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b.

Usage of this feature did not reveal any improvement in existing apps.

Conflicts:

	actionpack/lib/action_dispatch/routing/mapper.rb
	guides/source/routing.textile
	railties/lib/rails/engine.rb
	railties/lib/rails/paths.rb
	railties/test/paths_test.rb
2012-06-29 17:44:10 +02:00
José Valim
50b6110106 Remove unused responsibilities and add a few load definitions to engines
Since plugins were removed, we can clean up a few methods in engines.
We also use this opportunity to move `load_console`, `load_tasks` and
`load_runner` to Rails::Engine. This means that, if someone wants to
improve script/rails for engines to support console or runner commands,
part of the work is already done.
2012-06-29 17:04:47 +02:00
José Valim
0470ddcf03 Remove unnecessary Railties structure now that plugins are gone 2012-06-29 15:43:16 +02:00
José Valim
e9e6f63d9c Depend on thor 0.15.4 2012-06-29 15:24:12 +02:00
José Valim
dbc43bcce6 Rename RouteInspect to RoutesInspector for consistency 2012-06-29 14:04:24 +02:00
Carlos Antonio da Silva
d79ca9288e Add changelog entry for polymorphic option in model generator
Pull request #6856, merged in 52f6e47682003c83b0466bf5e140ee302498a226.
[ci skip]
2012-06-27 13:07:32 -03:00
Carlos Antonio da Silva
565d54d9ec Merge pull request #6880 from kennyj/fix_20120628
Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task.
2012-06-27 09:03:34 -07:00
Carlos Antonio da Silva
52f6e47682 Merge pull request #6856 from lexmag/polymorphic_generators
Add polymorphic option to model generator

For instance,

    $ rails g model Product supplier:references{polymorphic}

generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration.
2012-06-27 08:46:00 -07:00
kennyj
066e839467 Fix wrong testcase. This is a testcase for db:test:prepare. 2012-06-28 00:33:08 +09:00
Aleksey Magusev
94b230e189 Add polymorphic option to model generator
For instance,

    $ rails g model Product supplier:references{polymorphic}

generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration.

Also fix model_generator_test.rb#L196 and #L201
2012-06-27 18:12:28 +04:00
Aaron Patterson
ee74366da3 Merge pull request #6839 from bcardarella/async-actionmailer
Async actionmailer
2012-06-26 00:04:09 -07:00
kennyj
0ebd4f22c5 Change the behavior of db:test:prepare task when schema_format is sql for consistency. 2012-06-26 04:06:45 +09:00
kennyj
9ab805d880 Change the behavior of db:test:clone task when schema_format is sql for consistency. 2012-06-26 04:06:45 +09:00
Brian Cardarella
d1d6c364d0 Updated Changelogs 2012-06-23 15:21:33 -04:00
Brian Cardarella
b6792e9197 Add commented out ActionMailer async config option 2012-06-23 15:04:15 -04:00
Richard Huang
a6a4813083 ruby 1.9 hash syntax for generated code
app/controllers/application_controller.rb
app/views/layouts/application.html.erb
config/application.rb
config/routes.rb
test/performance/browsing_test.rb
2012-06-23 20:19:21 +08:00
Francesco Rodriguez
bc7ac33846 add :nodoc: to internal implementations [ci skip] 2012-06-22 16:29:59 -05:00
Rafael Mendonça França
39dec69712 Run the logger tests in isolation 2012-06-19 23:21:00 -03:00
Aaron Patterson
f945d157f7 run the notes tests in isolation 2012-06-19 19:08:13 -07:00
Aaron Patterson
265f13495f run railties tests in parallel, default to 2 cores 2012-06-19 17:08:23 -07:00
Aaron Patterson
7b6efb9cda join any extra args to the tmp path 2012-06-19 16:27:54 -07:00
Aaron Patterson
c445f0d61f expand the tmpdir to the realpath so tests on OS X pass 2012-06-19 15:41:52 -07:00
Aaron Patterson
7896f35be3 use system tmpdir rather than our own 2012-06-19 14:41:31 -07:00
kennyj
052e415f22 Change minimum (default) log level in PostgreSQL to warning. 2012-06-18 13:05:17 -03:00
José Valim
8c02918497 Require thor 0.15.3 onwards 2012-06-18 15:59:22 +02:00
kennyj
ee64abbf94 Don't read csv file during executing db:fixtures:load. 2012-06-17 02:42:53 +09:00
Aaron Patterson
8b35a239fb TestCase does not need to be loaded when loading the framework 2012-06-15 11:36:32 -07:00
Jon Leighton
ae3767c799 Fix observers with AR::Model 2012-06-15 19:15:37 +01:00
Jon Leighton
a205bf8780 Fix config.active_record.whitelist_attributes with AR::Model 2012-06-15 19:15:37 +01:00
José Valim
c53ff3317d Merge pull request #6708 from amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted
ignore .gitignore'd files in rake test:uncomitted
2012-06-11 12:37:05 -07:00
Akira Matsuda
2d3e488bb3 ignore .gitignore'd files in rake test:uncomitted 2012-06-12 03:29:48 +09:00
Rafael Mendonça França
04a7426a2e Merge pull request #6690 from suginoy/fix-templates-copy
Fix: 'rake rails:templates:copy' doesn't work
2012-06-11 09:40:39 -07:00
kennyj
358c5e893a Added a testcase for #6690. 2012-06-12 00:29:45 +09:00
José Valim
613357c1aa Merge pull request #6692 from schneems/schneems/something-went-wrong
Add Prompt to 404 & 500 Pages to Check Logs in Production
2012-06-10 02:40:44 -07:00
José Valim
03f2249153 Use . instead of :: for class methods, add CHANGELOG entries 2012-06-10 11:38:37 +02:00
José Valim
4845c0685a Merge pull request #6665 from schneems/schneems/raise-migration-error
Notify A User they Have Pending Migrations
2012-06-10 02:33:14 -07:00
schneems
4c82d3f0a4 add prompt to 404 & 500 pages to check logs
When new programmers push their code to a production server and receive an error they often don't know to check the logs, this simple reminder will help. Most professional applications have custom error pages so this change shouldn't affect them. The wording of the message should not confuse non-developer visitors.
2012-06-09 14:30:45 -05:00
schneems
d741a4c6f8 test errors for pending migrations
App should raise error on page_load
2012-06-09 13:31:11 -05:00
schneems
96f19f6cf6 raise error for pending migration
can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications.
2012-06-09 13:30:23 -05:00
Sugino Yasuhiro
ca1edd44c9 fix stylesheet template dir 2012-06-09 16:45:18 +09:00
Piotr Sarnacki
066e6c66ce Fix tests, active_authorizer shouldn't include blank values
Fix for a test failing after: 00ff0a6776
2012-06-09 03:15:39 +02:00
Rafael Mendonça França
d1136e6ad0 Merge pull request #6681 from arunagw/plugin_gen_fix
Plugin gen fix
2012-06-08 10:25:29 -07:00
Piotr Sarnacki
523820f81b Don't add sqlite3 to gemspec with -O on rails plugin new
(closes #6672)
2012-06-08 19:09:18 +02:00
Arun Agrawal
5fa87281ec We should not include engine.rake file into rake
if we are passing -T which is skip_test_unit

See issue #6673 for more details.

I saw that we are not creating dummy app even if
we do skip_test_unit.

Fixes #6673
2012-06-08 22:39:14 +05:30
Arun Agrawal
cbfcabc9e9 Removed protected as we already doing it above. 2012-06-08 22:39:10 +05:30
Rafael Mendonça França
6dfcc1b21d Merge pull request #6597 from frodsan/am_include_root_to_false
change AMS::JSON.include_root_in_json default value to false
2012-06-07 14:31:51 -07:00
Akira Matsuda
ef9bbb87e8 reduce number of Strings 2012-06-06 23:33:31 +09:00
Akira Matsuda
edee2c7b3b stop to_sing method names
Module#methods are Symbols in Ruby >= 1.9
2012-06-06 19:33:38 +09:00
Andrew White
45427e28a9 Make method name consistent with existing methods 2012-06-06 10:27:55 +01:00
Fred Wu
686966a186 Fixed the application_controller require_dependency path generated by the app generator 2012-06-06 19:02:11 +10:00