Commit Graph

2155 Commits

Author SHA1 Message Date
David Heinemeier Hansson
00ff3ba56f Need a double escape there 2010-04-09 10:52:28 -07:00
David Heinemeier Hansson
915a0ac420 Notice/alert are out of the layout, so notice has to go back into show to make it work for scaffolding 2010-04-09 10:48:51 -07:00
Jeremy Kemper
ad22017bdc Use thor shorthand for indicating that application.html.erb is a template 2010-04-09 10:26:49 -07:00
Jeremy Kemper
ec8e747960 Partially revert "A new application now comes with a layout and a stylesheet."
This reverts commit ea2c5fa8046e2f953b366adc94f0610ccfea0828.

Conflicts:

	railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb
	railties/test/generators/app_generator_test.rb
2010-04-09 10:04:20 -07:00
Jeremy Kemper
c44cacb070 Include app name in layout title 2010-04-09 09:49:46 -07:00
Jeremy Kemper
ea6a67cbdf Discourage << as public API, much less config 2010-04-09 09:22:16 -07:00
Jeremy Kemper
19e6006636 Layout contents are html-safe 2010-04-09 09:14:02 -07:00
Jeremy Kemper
157216b7b7 Trim application.html.erb fat 2010-04-09 09:13:47 -07:00
José Valim
cb8fa3573c Still use the directory command and also remove the fixture comments. 2010-04-09 08:47:19 +02:00
Santiago Pastorino
a654ef2ee1 Don't include fixtures if --skip-activerecord is given 2010-04-09 16:46:40 +12:00
Santiago Pastorino
808847792c db:test:prepare for tasks only if AR is loaded 2010-04-09 16:03:27 +12:00
José Valim
91d1012a98 Update rails.js to the latest one at http://github.com/rails/prototype-ujs 2010-04-08 13:53:18 +02:00
José Valim
4e92134dfa Fix a bug in ActionDispatch::Static where Rails cannot find assets if started in another directory which is not the RAILS_ROOT. 2010-04-08 12:52:37 +02:00
Mikel Lindsaar
336cb3c0bf Adding Rails.env= to railties to allow changing of rails env on the fly for rake tasks etc
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-08 12:07:19 +02:00
José Valim
ec73710c79 Alleviate the pain in working with utf8 templates by setting a default encoding. 2010-04-07 02:25:36 +02:00
José Valim
af13057524 Use raw in yield since templates engines should not be required to html_safe their contents. 2010-04-06 23:08:21 +02:00
José Valim
77b238d169 Remove :layout option from generators. 2010-04-06 11:51:30 +02:00
José Valim
4bacc2a66d Update the documentation for Engine and Railtie. 2010-04-05 16:02:23 -07:00
José Valim
ea2c5fa804 A new application now comes with a layout and a stylesheet. 2010-04-06 00:18:35 +02:00
Ryan Bigg
efa7e96821 It seems the test directory backtrace line is output with a / before it, thereby previously making it not match the regex. Support APP_DIRS that have backtrace lines maybe beginning with /. [#4277 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-05 23:50:12 +02:00
Xavier Noria
89978f10af moves Object#singleton_class to Kernel#singleton_class to match Ruby also there, same for #class_eval to simplify, and adds coverage for class_eval 2010-04-05 12:15:08 -07:00
José Valim
c140aca361 Remove app/views from the load paths [#4226 state:resolved] 2010-04-05 12:30:59 +02:00
José Valim
6690d66292 Rename config.cookie_secret to config.secret_token and pass it as configuration in request.env. This is another step forward removing global configuration. 2010-04-05 12:00:24 +02:00
Xavier Noria
11161e6c96 Merge commit 'rails/master' 2010-04-03 10:56:15 -07:00
Santiago Pastorino
47c99f9012 Fixing index style [#4313 state:committed]
Signed-off-by: wycats <wycats@gmail.com>
2010-04-02 16:53:31 -07:00
Rolf Bjaanes
d898a4ba42 Raise exceptions instead of rendering error templates in test environment [#4315 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-02 20:47:42 +02:00
Rizwan Reza
0dd3eac967 Merge branch 'master' of git://github.com/rails/rails 2010-04-02 14:57:30 +04:30
David Heinemeier Hansson
d868cb4f8a Prep for beta2, depend on latest Bundler 2010-04-01 13:36:45 -07:00
Jeremy Kemper
8dfa27669b Missed __FILE__ 2010-03-31 17:27:39 -07:00
Jeremy Kemper
b3980af8d1 To skip bundler, rm Gemfile. Create a Gemfile to use it again. 2010-03-31 13:56:44 -07:00
Joshua Peek
fc3a39b599 Add --skip-bundler option to rails application generator
NOTE: This does not fix the bundler activation issue. The "bundler"
gem will still be installed and activated when you install rails.
2010-03-31 14:11:51 -05:00
Xavier Noria
824fa10f4d Merge commit 'rails/master' 2010-03-31 07:47:58 -07:00
Ravinder Singh
db28d407f7 Create tmp directories if required before starting server [#3907 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-03-31 16:02:59 +02:00
Joshua Peek
53e16d8011 Missed a few spots in railties 2010-03-30 14:18:08 -05:00
José Valim
41b45d5655 Bring rdoc tasks back to plugins. 2010-03-30 14:41:58 +02:00
José Valim
ffcd44144a Remove deprecated model_subclass since it was never published. 2010-03-30 14:41:58 +02:00
Xavier Noria
ce3864aa36 periods are not metacharacters within character classes 2010-03-30 01:55:06 -07:00
José Valim
ebcc4c5e74 Remove if/else branch when generating the documentation since we are simply inspecting the load path. 2010-03-30 10:00:46 +02:00
postmodern
f9e84a9e5a Changed gem_path to yield the path found in $LOAD_PATH to a block.
* This allows gems not found in $LOAD_PATH to be safely ignored by the
  rails documentation task.

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-03-30 09:58:39 +02:00
Michael Koziarski
bc298152f8 Fix syntax error and avoid the use of unless/else. 2010-03-30 14:31:16 +13:00
wycats
4aded43b73 Replace the placeholder base_hook API with on_load. To specify some code that
should run during framework load do:

ActiveSupport.on_load(:action_controller) do
  # Code run in the context of AC::Base
end
2010-03-29 17:08:50 -07:00
José Valim
331327d391 Just inspect load paths to generate the documentation. 2010-03-30 01:34:06 +02:00
wycats
b94c4080e5 Revert "Ruby 1.9: use ruby-debug19. [#3949 state:resolved]"
This wasn't the issue here; we need to beef up the docs and speak to
Wayne and Mark about installation.

This reverts commit da238dafd7c242eb75ae37e6243b61baf763e3d0.
2010-03-30 01:32:26 +02:00
Jeremy Kemper
4fbcde43e3 Ruby 1.9: use ruby-debug19. [#3949 state:resolved] 2010-03-30 01:32:26 +02:00
Jeremy Kemper
af8852d1ad Work without bundler 2010-03-29 16:25:52 -07:00
wycats
a509b0b18f Revert "Ruby 1.9: use ruby-debug19. [#3949 state:resolved]"
This wasn't the issue here; we need to beef up the docs and speak to
Wayne and Mark about installation.

This reverts commit da238dafd7c242eb75ae37e6243b61baf763e3d0.
2010-03-29 14:07:12 -07:00
Jeremy Kemper
da238dafd7 Ruby 1.9: use ruby-debug19. [#3949 state:resolved] 2010-03-29 13:59:20 -07:00
José Valim
74efe4c253 Revert "Update USAGE docs for generators."
This reverts commit d31e03f3566471f2ad04dc6dace889fae962f7a8.
2010-03-29 18:46:04 +02:00
José Valim
9a865ee25e Revert "Reorganized app/test directory. [#3057 state:resolved]"
This reverts commit a0dc6755db71b33aebccdb95fd0dd7097c934c04.
2010-03-29 18:36:28 +02:00
Rizwan Reza
d31e03f356 Update USAGE docs for generators. 2010-03-28 22:38:46 -07:00