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

7435 Commits

Author SHA1 Message Date
Vijay Dev cb244f4f70 use https for github url 2011-10-07 22:19:55 +05:30
mhutchin fca2613ec4 Correct formatting 2011-10-07 08:26:05 -07:00
mhutchin d4ea804e21 Replace the reference to the annotate_models plugin (unchanged since 2008) with more current annotate_models gem 2011-10-07 08:16:33 -07:00
Xavier Noria b1c20e37ec asset pipeline guide: removes Apache config for serving pre-compressed assets, and expands the information about nginx support for this 
A robust Apache configuration for this feature seems to be tricky,
one that takes into account Accept-Encoding, sets Vary, ensures
Content-Type is right, etc.
 2011-10-07 15:05:14 +02:00
Dimitar Dimitrov ddee206dfb More understandable warning in the local_constant_names section 
Rewrite the warning about local_constant_names in Ruby 1.8 to make it more understandable. Word ordering fixes in the same section.
 2011-10-07 03:14:59 +03:00
clay shentrup 0549ba10b3 Clarifying ambiguous description of require_self in the asset pipeline 2011-10-06 16:09:36 -07:00
Manuel Menezes de Sequeira a17e5e2462 Merge branch 'master' of github.com:lifo/docrails 2011-10-06 21:31:26 +01:00
Manuel Menezes de Sequeira 29bf193cad Undid previous change which violated the convention regarding output (use "# =>") used in these guides. Corrected typo in previous correction. (Thanks for pointing this out, vijaydev.) 2011-10-06 21:29:58 +01:00
Vijay Dev 545ddbdbc5 fix an example 2011-10-06 23:50:16 +05:30
Vijay Dev 2224a06b72 fix a space in the assets guide 2011-10-06 20:04:09 +05:30
Xavier Noria 9d091c038d revises the precompilation section of the asset pipeline guide (web server configuration for gzipped assets pending) 2011-10-06 16:23:56 +02:00
Hendy Tanata 79a719a6d2 Grammar fixes for the routing guide. 2011-10-06 14:03:46 +08:00
Ryan Bigg 4f5878a4a9 Merge branch 'master' of github.com:lifo/docrails 
* 'master' of github.com:lifo/docrails:
  use Rails.root.join for assets guide
 2011-10-06 13:33:55 +11:00
Ryan Bigg 02eac2db94 [config guide] Show example of defining initialization hooks 2011-10-06 13:32:39 +11:00
Ryan Bigg 00751f0257 [config guide] mention that to_prepare hooks are called upon every request in dev, but only once in production 2011-10-06 13:32:21 +11:00
Nick Quaranto 3d595c5eae use Rails.root.join for assets guide 2011-10-05 22:27:33 -04:00
Ryan Bigg 876d3f23d2 [engines guide] More explanation for 'Generating an engine' 2011-10-06 09:18:21 +11:00
Ryan Bigg 1ba6b40698 [engines] Expanded 'What are engines?' and 'Generating an engine' sections 2011-10-06 09:18:21 +11:00
Manuel Menezes de Sequeira cde529448b Some small corrections and improvements to the text. 2011-10-05 22:52:50 +01:00
Manuel Menezes de Sequeira 07343d2974 Merge branch 'master' of github.com:lifo/docrails 2011-10-05 22:14:49 +01:00
Manuel Menezes de Sequeira 8d775d5f1d Correction of code snippet tag from shell to ruby. 2011-10-05 22:14:41 +01:00
Prem Sichanugrist d6c7185d77 Update Rails routing guide to mention that `redirect()` is a 301 permanent redirect 
I had to try out myself to realize that it's 301, so this should be helpful to everyone.
 2011-10-05 15:31:14 -03:00
Vijay Dev 46ce7f1f77 Merge branch 'master' of github.com:lifo/docrails 2011-10-05 18:42:18 +05:30
Vijay Dev ea49935a6e copy editing 2011-10-05 18:40:45 +05:30
Hendy Tanata a44bbfc1c7 Corrections to Active Record Validations and Callbacks guide. 2011-10-05 17:35:58 +08:00
José Valim 4cea4ee6b5 Fix regression when calling helpers inside sprockets. 2011-10-05 09:37:58 +02:00
Ryan Bigg 2c4e08d872 [engines guide] initial layout 2011-10-05 08:38:04 +11:00
Mark J. Titorenko 9c69ef3167 correct path used in "digested assets are not mistakenly removed" test 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-04 22:04:49 +02:00
Mark J. Titorenko 1f0b78e045 add failing test: "digested assets are removed from configured path" 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-04 22:04:45 +02:00
Manuel Menezes de Sequeira bb4edc8edf More corrections and clarifications to the Active Record Validations and Callbacks guide. 2011-10-04 16:13:16 +01:00
José Valim 7f1a666db5 Fix failing tests and refactor assets.rake 2011-10-04 11:25:36 +02:00
Brendan Ribera 57d9737f2f Test demonstrating #3053: If-Modified-Since gets swallowed up by rack-cache. 2011-10-03 11:32:24 -07:00
Manuel Menezes de Sequeira 547f4af2ca Several small corrections and clarifications to the Active Record Validations and Callbacks guide. 2011-10-03 18:03:35 +01:00
Mark J. Titorenko a7648c213d add failing test for #3198 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-03 13:36:26 -02:00
Manuel Menezes de Sequeira e3d4603151 Several small corrections and improvements to the Migrations and Active Record Basics guides. 2011-10-03 14:47:24 +01:00
Sam Pohlenz 6f429f375e Ensure that enhancements to assets:precompile task are only run once 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-03 11:18:49 +02:00
Sam Pohlenz 0e1f7e0058 Replace calls to capture(:stdout) with quietly in assets tests 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-03 11:18:44 +02:00
José Valim d68884f4fd :group => :assets should only run in the assets environment. 2011-10-02 22:08:33 +02:00
Xavier Noria ac1fc5c594 rewords the docs of config.assets.initialize_on_precompile in the asset pipeline guide 2011-10-02 12:33:14 -07:00
Xavier Noria 6e00c05607 documents config.assets.initialize_on_precompile in the asset pipeline guide 2011-10-02 11:35:58 -07:00
Santiago Pastorino c1547fcf6d Precompile properly refers files referenced with asset_path test 2011-10-02 13:57:29 -02:00
Santiago Pastorino 9b34e31155 capture was commented out 2011-10-02 13:52:29 -02:00
José Valim 753424079e Provide initialize_on_precompile which, when set to false, does not initialize the app for precompilation. Defaults to true. 2011-10-02 12:15:21 +02:00
José Valim 63f6da050a Update CHANGELOG. 2011-10-02 11:17:06 +02:00
Guillermo Iguaran 101fb42106 Print information about .railsrc to users 2011-10-02 01:06:39 -05:00
Guillermo Iguaran 7039def6e1 Read extra args for 'rails new' from ~/.railsrc 2011-10-02 00:12:40 -05:00
Manuel Menezes de Sequeira a917c2ba8b Several other small corrections. 2011-10-01 12:48:34 +01:00
Manuel Menezes de Sequeira 059c04d4dd Several small corrections and clarifications. 2011-10-01 11:39:00 +01:00
Manuel Menezes de Sequeira 409268edfc Small typo corrected. 2011-09-30 23:28:51 +01:00
José Valim 926e97ca66 Merge pull request #3181 from yahonda/fix_uninitialized_constant_testfixtures 
Modified how to handle if ActiveRecord is defined.
 2011-09-30 09:44:26 -07:00
Yasuo Honda 44791a2bc6 Modified how to handle if ActiveRecord is defined. 2011-09-30 12:05:53 -04:00
José Valim fe157a7475 Merge pull request #3177 from arunagw/void_warnings_removed 
possibly useless use of :: in void context Warning removed
 2011-09-30 03:35:16 -07:00
Arun Agrawal b0b436ebce warning removed : '&' interpreted as argument prefix 2011-09-30 15:56:38 +05:30
Arun Agrawal e81c427fe8 possibly useless use of :: in void context Warning removed 2011-09-30 14:13:58 +05:30
Santiago Pastorino d2888de598 Add CHANGELOG entries 2011-09-29 16:49:31 -03:00
Dmitriy Kiriyenko 148e4a5413 Honour RAILS_ENV environment variable when running rake. 2011-09-29 15:35:25 +03:00
Xavier Noria cba3c00831 partial pass over the assets guide 2011-09-28 13:48:48 -07:00
Ryan Oblak 4535191c61 Modified String#pluralize to take an optional count parameter. 2011-09-28 12:24:06 -07:00
Vijay Dev f3b8cd9d36 fixing typo in assets guide 2011-09-28 13:35:46 +05:30
Michael Hutchinson 0678a5bb18 Corrected a typo. 2011-09-27 18:11:01 -07:00
Justin Leitgeb 9f74ce2924 Make case in configuration document consistent 2011-09-27 18:45:27 -04:00
Xavier Noria 41c8277a9b the infamous detail only spotted in GitHub diffs no matter how careful you were before pushing 2011-09-27 13:55:41 -07:00
Xavier Noria c612183ad1 partial pass over the asset pipeline 2011-09-27 13:51:06 -07:00
Vijay Dev 33b55cfbdb Merge branch 'master' of github.com:lifo/docrails 2011-09-28 00:04:45 +05:30
Vijay Dev a775853d6a copy edit d47c2c4 2011-09-28 00:00:50 +05:30
Justin Leitgeb cb5c39f8a0 Make the Rack::SSL middleware configurable 2011-09-26 22:22:52 -04:00
Xavier Noria 01e5e2faeb partial pass over the asset pipeline guide 2011-09-26 18:19:25 -07:00
Nicolás Hock Isaza 94ed1e2495 Alert about the new Bundler require for asset gems 
If you are coming from a Rails 3.0 application, you won't have
the correct Bundler require statement.

This will cause the gems under the `assets` group not to be available
in the development and production environment.

I think this is related to the issue #39 in rails-sass
https://github.com/rails/sass-rails/issues/39
 2011-09-26 16:34:42 -05:00
Santiago Pastorino cf90181d84 Merge pull request #3136 from guilleiguaran/clear-digests-on-precompile 
Avoid use of existing precompiled assets during rake assets:precompile run
 2011-09-26 13:57:07 -03:00
Santiago Pastorino 17882d2a9e Copy assets to nondigested filenames too 2011-09-26 13:54:06 -03:00
Chris Kimpton 51cc6e4f1c Fixed typo that I added - doh. 2011-09-26 09:21:12 +02:00
Chris Kimpton d47c2c4620 Clarify that the Active Record config should just work automatically 2011-09-26 08:17:28 +02:00
Chris Kimpton 4b9b2f3d04 add some notes on setup for Active Record tests 2011-09-26 08:06:41 +02:00
José Valim e69011521d Avoid using pathnames and automatically create the manifest directory if one does not exist yet. 2011-09-24 03:17:49 +02:00
José Valim e9b02ae27a Add test for belongs_to? and group initializers. 2011-09-24 03:17:43 +02:00
José Valim 6795a9b309 Remove the ENV flag, yagni. 2011-09-24 03:17:37 +02:00
José Valim eb367afeed `rake assets:precompile` loads the application but does not initialize it. 
To the app developer, this means configuration add in
config/initializers/* will not be executed.

Plugins developers need to special case their initializers that are
meant to be run in the assets group by adding :group => :assets.

Conflicts:

	railties/CHANGELOG
	railties/test/application/assets_test.rb
 2011-09-24 03:17:23 +02:00
Waynn Lue 17ba60a724 pluralize "locales" since that's what's used in other parts of the document, and add a missing "on" 2011-09-23 00:25:37 -07:00
Terence Lee 9d46823b5d set env to let rails know we're precompiling 2011-09-22 20:54:02 +02:00
Santiago Pastorino 2bf33bd4bc Merge pull request #3027 from alex3/assets-precompile-regex-fix 
Default precompile regex was erroneously matching files
 2011-09-21 18:25:40 -07:00
Christopher Arrowsmith efb8a7a7b9 Changed "en-UK" to "en-GB" 
Signed-off-by: Christopher Arrowsmith <chris@agouti.co.uk>
 2011-09-22 01:18:22 +01:00
Santiago Pastorino 007f567011 Add jquery-rails to Gemfile of plugins, test/dummy app uses it. 
Closes #3091
 2011-09-21 20:53:08 -03:00
Vijay Dev caa95ab6d8 Merge branch 'master' of github.com:lifo/docrails 2011-09-21 19:35:09 +05:30
Vijay Dev 3e80462b95 Revert "add a missing "on" and remove the "endprologue" text" 
This reverts commit 3c5340ec9c.

Reason: endprologue should not have been removed.
 2011-09-21 19:28:36 +05:30
Vijay Dev 8d7aee7173 indentation fixes 2011-09-21 19:21:58 +05:30
Waynn Lue 3c5340ec9c add a missing "on" and remove the "endprologue" text 2011-09-21 02:10:07 -07:00
Waynn Lue 564d7edf69 add a '.' to etc 2011-09-21 01:28:59 -07:00
Waynn Lue 952bccd1ab add "the" to mirror the structure of the other two points 2011-09-21 01:23:58 -07:00
Vijay Dev 5684ecf749 copy edits 302e5707 2011-09-20 19:47:33 +05:30
Vijay Dev 7ed97bc814 remove unnecessary markup 2011-09-20 19:33:01 +05:30
Jan Vlnas ea29968bcf Locale code for Czech is ":cs" 2011-09-18 16:41:21 +03:00
Uģis Ozols 663031801c sass-rails helpers - hyphenated in Sass, underscored in Ruby. 2011-09-17 10:00:53 +03:00
Alex Yakoubian 6e63e029b3 Default precompile regexp that properly matches application.js and application.css 2011-09-16 20:46:37 -07:00
Vijay Dev 27f1320fde Fixing incorrect notextile tags 2011-09-16 23:22:50 +05:30
Vijay Dev 8411f631c4 minor edit 2011-09-16 23:22:50 +05:30
Kir Shatrov 302e570777 "Passing variables into the translation" section added 2011-09-16 17:43:05 +04:00
Guillermo Iguaran 28677014a4 Add reference about --skip-sprockets to Asset Pipeline Guide 2011-09-15 20:07:01 -05:00
Guillermo Iguaran b50394bf84 config.action_controller.asset_host shouldn't set to nil during precompile 2011-09-15 19:55:52 -05:00
Alexey Vakhov 7531aa7641 update guides, use html safe translations in i18n 2011-09-15 10:41:55 +04:00
Vijay Dev 49476eee78 Merge branch 'master' of github.com:lifo/docrails 2011-09-15 00:32:52 +05:30
Vijay Dev 9980f46ca2 No more changelogs inside guides 2011-09-15 00:13:29 +05:30
Vijay Dev 5f2a35604e Mention that old fixes are to be done on 3-0-stable 2011-09-14 23:39:55 +05:30
Vijay Dev 5e1285dfb3 change first_or_new to first_or_initialize as per 11870117, and some edits 2011-09-14 23:08:31 +05:30
Vijay Dev 823e16f57c update 3.1 release date in changelogs 2011-09-14 22:46:12 +05:30
Dallas Reedy bc058509a8 forgot to sign my name to the Changelog 2011-09-14 09:32:27 -07:00
Dallas Reedy c7835c5161 Removed mention of deprecated proxy methods in favor of using proxy_association. 2011-09-14 09:16:54 -07:00
Vijay Dev 7302e1cdf2 remove info about guides hackfest 2011-09-14 19:02:33 +05:30
Santiago Pastorino 0d48b3afa9 Revert "Provide a way to access to assets without using the digest, useful for static files and emails" 
This reverts commit 82afaa0686.
 2011-09-14 00:29:03 -07:00
Ben Walding b3ff720567 Add equivalent nginx configuration 2011-09-14 15:27:38 +10:00
Guillermo Iguaran a89d39ec88 Fix broken asset test 2011-09-13 18:36:38 -05:00
Mark J. Titorenko f22407dd34 Don't mount Sprockets at config.assets.prefix if config.assets.compile is false. 2011-09-13 18:16:52 -05:00
Santiago Pastorino 82afaa0686 Provide a way to access to assets without using the digest, useful for static files and emails 2011-09-13 15:18:21 -07:00
Jaime Iniesta bde113a82e Fix typos and broken link on asset pipeline guide 2011-09-14 00:09:59 +02:00
Vijay Dev d3baa92831 delete stray backup files from guides sample app 2011-09-13 18:46:34 +05:30
Vijay Dev 23fc5fe0e2 Merge branch 'master' of github.com:lifo/docrails 2011-09-13 18:39:36 +05:30
45north 7b22b01930 Fixed markup error. 2011-09-13 15:25:46 +03:00
Mike Gunderloy 317ad8cb62 Fix typo 2011-09-13 06:47:13 -05:00
Guillermo Iguaran a65010fddb Fix precompile asset_host test 2011-09-13 04:35:12 -05:00
Guillermo Iguaran e767cda6ea Move asset tests to assets_test file 2011-09-13 03:19:02 -05:00
Deepak Prasanna 73e8dd189b fixed the failing generators_test 2011-09-13 11:59:40 +05:30
Santiago Pastorino 038e45a2b6 Merge pull request #2987 from kennyj/master 
fix https://github.com/rails/rails/issues/2947 (with testcase)
 2011-09-12 23:04:14 -07:00
Aaron Patterson 68ec26c70c point rails at Journey for dev and edge 2011-09-12 16:50:49 -07:00
Aaron Patterson d21e0e2af3 adjust route inspection to work with Journey 2011-09-12 16:50:48 -07:00
dharmatech 7d235b972b getting_started.textile: Fix typo and split up a sentence in section "Building a Multi-Model Form" 2011-09-12 15:55:01 -05:00
Vijay Dev c5c448221f Merge pull request #67 from alanzeino/master 
'Getting Started' guide typo fix
 2011-09-12 11:00:16 -07:00
kennyj 21eaba4c39 fix https://github.com/rails/rails/issues/2947 (with testcase) 2011-09-13 02:59:57 +09:00
Vijay Dev acc6252cb0 Delete contribute.textile now that its contents are merged to the contributing_to_ruby_on_rails guide 2011-09-12 23:25:33 +05:30
Vijay Dev c5118f29de change GH issue tracker url 2011-09-12 23:24:14 +05:30
José Valim e9db21743b Use the proper executable on tests. 2011-09-12 10:53:20 -07:00
Santiago Pastorino d762e22c04 Merge pull request #2985 from kennyj/master 
fix https://github.com/rails/rails/issues/2582 (with testcase)
 2011-09-12 10:18:19 -07:00
dharmatech 70198fdb36 getting_started.textile: Fix typos in section "Rendering a Partial Form" 2011-09-12 12:05:15 -05:00
kennyj 3ce830272e fix https://github.com/rails/rails/issues/2582 (with testcase) 2011-09-13 01:06:31 +09:00
José Valim 11fa70dd09 Just provide the executable for railtie. This should be fine since Rubygems now warns before overriding them. 2011-09-12 09:05:11 -07:00
James Gifford d7154d4832 Added getting_started code, updated guide with link to rails github repo and path to code 2011-09-12 10:30:45 -04:00
Alan Zeino 6e782f8944 Slight change to reflect current 'destroy' code generated by scaffold in 3.1 release. 2011-09-12 11:12:09 +10:00
Vijay Dev e47bb1cbe7 merged the contribution guides and changed the 
link in the layout accordingly
 2011-09-11 19:45:41 +05:30
Vijay Dev 95fdaf965a Merge branch 'master' of github.com:lifo/docrails 2011-09-11 17:41:39 +05:30
Emin Hasanov 22a4f7e8bd Fix typo in "must-revalidate" header name 2011-09-11 14:18:07 +06:00
Andy Lindeman 28e32598b9 Fix for :instance_reader => false code example 2011-09-10 21:49:13 -04:00
Xavier Noria e8e1911738 clarify that documentation bugs have to be reported as Rails issues. [Closes #2858] 2011-09-10 19:29:50 +02:00
Michael P Laing 8a0876478d Update to conform to rails 3.1 generated caode 2011-09-10 16:38:50 +02:00
Deepak Prasanna ab5f487184 added test for db migrate:redo 2011-09-10 12:55:37 +05:30
Santiago Pastorino 4d3a73e5dd Merge pull request #2957 from waseem/migration_status_tests 
Tests for rake db:migrate:status.
 2011-09-09 21:58:37 -07:00
Santiago Pastorino be24be62b6 Merge pull request #2876 from alex3/patch-1 
Fixed assets precompile regex
 2011-09-09 21:56:28 -07:00
Aaron Patterson 0f04260c51 railties depends on actionpack, so put actionpack in the include path 2011-09-09 19:00:33 -07:00
Aaron Patterson 9736cb2bab rake already ships with a ruby command 2011-09-09 18:56:11 -07:00
Aaron Patterson 7bc6a0098b move route inspecting to an object so that we can more easily test it 2011-09-09 18:50:32 -07:00
Waseem Ahmad bc7eddea20 Tests for rake db:migrate:status. 2011-09-09 15:39:53 +05:30
Jon Leighton cbf1dc7842 Merge pull request #2757 from andmej/first_or_create_pull_request 
Add first_or_create family of methods to Active Record
 2011-09-08 15:07:23 -07:00
Jon Leighton 04baa4b2ca Remove failing test which was wrongly introduced. 
This test was introduced in pull request #2577. The author of the pull
request included the test, which was originally in #2230, at the same
time as fixing a separate (but related) bug. However, the author did not
include a fix for this test, so when #2577 was merged, a failing test
was introduced.

So I am removing the failing test for now. If anyone wants to fix the
bug, please do so and submit a complete pull request with a test and
a fix.
 2011-09-08 22:28:43 +01:00
Alex Yakoubian 901c02d86a Fixed assets precompile regex, now accepts Procs 2011-09-08 13:44:08 -07:00
Vijay Dev 59198ecb65 some copy-edits 2011-09-08 18:25:43 +05:30
Vijay Dev 0d25491581 Merge branch 'master' of github.com:lifo/docrails 2011-09-08 18:06:43 +05:30
dharmatech f50aeda2f7 getting_started.textile section 6: Correct file names in table 2011-09-07 20:23:28 -05:00
Wayne E. Seguin 8b635596b7 Thanks to the hard work of Ken Collins ( @metaskills ) on the ActiveRecord SQLServer Adapter ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter ), AR SQLServer Adapter works for Linux, OSX and Windows. Thus the sqlserver adapter should include so that users may use it with the new application generator: 
rails new w00t -d sqlserver ...
 2011-09-07 17:27:32 -03:00
Vijay Dev 190a2bf9c4 Revert "Rails.root is a Pathname, no need to use File.join first." 
This reverts commit 760fd1eb42.

Reason: We need a fully qualified path string here, not a Pathname.
 2011-09-07 22:54:49 +05:30
Vijay Dev 0fb3aa750f copy edit assets guide 2011-09-07 22:53:16 +05:30
dharmatech 98b55ee2e3 getting_started.textile: Fix another typo 2011-09-07 09:09:11 -05:00
Joost Baaij 760fd1eb42 Rails.root is a Pathname, no need to use File.join first. 2011-09-07 16:09:56 +03:00
Guillermo Iguaran 1db5836754 Refactor assets tests to use add_to_config instead of creating initializers with config values 2011-09-06 23:00:36 -05:00
Ryan Walker 198092e2c0 Added note about adding a javascript runtime to Gemfile for production environment. 2011-09-06 14:06:34 -03:00
Santiago Pastorino ef14a0ec86 Merge pull request #2577 from rails-noob/master 
Fix double slash at start of paths when mounting an engine at the root.
 2011-09-06 09:10:39 -07:00
Santiago Pastorino 1e61f2603c Merge pull request #2889 from guilleiguaran/perform-caching-assets 
config.action_controller.perform_caching isn't used anymore in asset pipeline
 2011-09-06 09:03:52 -07:00
Guillermo Iguaran 6fc518e2ec config.action_controller.perform_caching isn't used anymore in assets pipeline, instead we are using config.assets.digest now 2011-09-06 10:46:52 -05:00
rails-noob 43fbb1e6b8 Fix bug #2579. 
Avoids double slash at start of paths when mounting an engine at the root.
 2011-09-06 15:26:19 +00:00
Marcus Ilgner 5e2bf4de62 Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested. 2011-09-06 16:27:26 +02:00
Uģis Ozols 9584e15d39 Change hyphen to underscore. 2011-09-06 17:13:30 +03:00
Santiago Pastorino bd17c762ae Bump uglifier up 2011-09-05 20:33:26 -03:00
Santiago Pastorino 7f7e362c14 Merge pull request #2873 from guilleiguaran/remove-unused-config 
Remove unused config variable from test.rb template
 2011-09-05 07:09:13 -07:00
Guillermo Iguaran e8cb06a386 Remove unused config variable from test.rb template 2011-09-05 08:59:37 -05:00
dharmatech a76c23e6be getting_started.textile: fix minor typo 2011-09-05 04:07:48 -05:00
José Valim 7e16394b92 Merge pull request #2713 from FLOChip/500-fixed 
remove misleading line on 500 error page. #2648
 2011-09-05 00:16:41 -07:00
Guillermo Iguaran 8df4fb1bb4 Add reference about "bundle install --without assets" in Precompiling Assets section. 2011-09-04 21:17:23 -05:00
Guillermo Iguaran a1dbd94b60 Add CoffeeScript example to JavaScript and ERB section 2011-09-04 21:01:04 -05:00
Guillermo Iguaran 3e62235c6c Add JavaScript and ERB section to Asset Guide 2011-09-04 20:56:47 -05:00
Hendy Tanata 0a2ea92efa Fix grammar for content_tag_for and div_for docs. 2011-09-05 08:08:38 +08:00
Guillermo Iguaran 9bc0082f29 AssetNotPrecompiledError should be raise when config.assets.digest = false, config.assets.compile = false and manifest file isn't present 2011-09-04 17:24:01 -05:00
Ray Baxter 14157b779b clarify where the branch name will exist 2011-09-04 13:34:07 -07:00
Vijay Dev abb0905404 Merge docrails, resolving conflicts in the assets guide 2011-09-04 18:58:34 +05:30
Vijay Dev a6bafb327d minor fixes in assets guide 2011-09-04 18:49:16 +05:30
José Valim 98c3fd87e2 Merge pull request #2841 from wojtekmach/app-generators-group 
Add gem group support to generators
 2011-09-04 01:47:10 -07:00
Wojciech Mach 47bc5d0cc8 Add gem_group support to generators 2011-09-04 10:32:48 +02:00
José Valim 036a25019d Merge pull request #2816 from sikachu/content_tag_for 
Make `content_tag_for` and `div_for` accepts the array of records
 2011-09-04 00:28:15 -07:00
Prem Sichanugrist b84cee08c6 Make `content_tag_for` and `div_for` accepts the array of records 
So instead of having to do this:

   @items.each do |item|
     content_tag_for(:li, item) do
        Title: <%= item.title %>
     end
   end

You can now do this:

   content_tag_for(:li, @items) do |item|
     Title: <%= item.title %>
   end
 2011-09-04 11:55:12 +07:00
Rinaldi Fonseca d72ecd92a2 Added |t| to create_table block 2011-09-04 00:34:56 -03:00
Santiago Pastorino 0eefd8dc48 Remove useless parens 2011-09-04 00:24:31 -03:00
Arun Agrawal a6c60222c5 Modified content in guides and comments 
for "assert /" warnings.
Removed because if somebody will use this code
they will get warnings!
 2011-09-04 08:24:02 +05:30
Arun Agrawal c8d0dc376a Warnings removed for "assert_match /" Please do 
not add more.!
 2011-09-04 08:23:13 +05:30
Arun Agrawal 34618e6697 Warnings removed for using shadow variable. 2011-09-04 08:17:53 +05:30
Xavier Noria 0a38e2a5ce restores the API docs of AR::Fixtures, made a quick pass over them, revises link in fixture template [closes #2840] 2011-09-03 15:20:30 -07:00
Vijay Dev 5014b33028 add some missing dots in the docs 2011-09-04 03:44:47 +05:30
Guillermo Iguaran af54fc5586 Add bcrypt-ruby to Gemfile template 2011-09-03 00:44:23 -05:00
Xavier Noria 5912ed9902 fixes CSS example in the asset pipeline guide 2011-09-03 01:36:57 +02:00
Guillermo Iguaran 1b8290db52 Fix asset_path example in CSS and ERB section 2011-09-02 17:10:11 -05:00
Vijay Dev 5b7bcb4959 document send_file guesses content type from the file extension 
and remove info about x_send_file option to send_file
 2011-09-03 02:46:09 +05:30
Richard Hulse a3edf3d2a3 fix YUI description 
YUI CSS compressor does not extend syntax! Also
added link to more info
 2011-09-03 09:11:20 +12:00
David Peckham b3a03253a7 Fixed a typo in the section about migration. 2011-09-02 13:38:20 -07:00
Vijay Dev f83f169b85 some of the changes for validation earlier reverted from d20281a 2011-09-03 01:40:00 +05:30
Franco Catena 78497c7c27 Change photos_path to photos_url in Using redirect_to 
Is more "correct" a complete url than only the path
 2011-09-02 14:52:58 -03:00
Vijay Dev eeda8403fd Merge branch 'master' of github.com:lifo/docrails 2011-09-02 23:00:59 +05:30
Vijay Dev 44284a613b Revert "Fixing guides validation errors." 
This reverts commit d20281add1.

Reason: This needs more investigation. Will apply when this is verified.
 2011-09-02 22:58:40 +05:30
Vijay Dev 220c77dd68 debug option to js, stylesheet tags are ignored when debug mode is off 2011-09-02 22:42:23 +05:30
Andrew Olson 57847fbfaf Merge branch 'fix_validation_errors' 2011-09-02 12:02:14 -04:00
Andrew Olson d20281add1 Fixing guides validation errors. 2011-09-02 11:48:45 -04:00
Matt Burke 3a7c16dbb9 When a collection is empty, render returns nil. 2011-09-02 10:20:23 -04:00
Alexey Vakhov e61d6afbab fix indent for generator environment method 2011-09-02 13:31:00 +04:00
Stephen J. Butler 16aa4330d7 Change the styling of '<ruby>initialize</ruby>' to '+initialize+' (the former breaks the HTML generation). 2011-09-01 19:55:38 -05:00
Richard Hulse ca7c37a660 fix some minor omissions in pipeline docs 2011-09-02 08:39:16 +12:00
Sebastian Martinez 2d92962701 Add #update_attributes as another alternative to #update_column. 2011-09-01 16:02:08 -03:00
Vijay Dev c96cb8897b Revert "Fix logic in 3.1 release notes sentence" 
This reverts commit 30d65da17e.

Reason: This commit is incorrect. It is indeed recommended to use
update_attribute when you want callbacks to be invoked.
 2011-09-01 23:52:23 +05:30
Andy Leeper 8e900f1e38 Modified ActionMailer Basics doc with the following change: 
* Changed the lines that said <tt>config/environments/env.rb</tt> to <tt>config/environments/$RAILS_ENV.rb</tt>.  People were mis-interpreting the filename to literally be env.rb.
 2011-09-01 10:42:28 -07:00
Roy Tomeij 3461a5d436 Change "SCSS" to "Sass" in sentences where it's referred to as "language", because Sass is the language (SCSS is one possible syntax within the Sass language), as per documentation on sass-lang.com. 2011-09-01 17:24:26 +02:00
Richard Hulse cfd785f910 Move css data URI into css/erb section 2011-09-01 21:20:26 +12:00
Richard Hulse 1f998c7578 pipeline docs improvement 
Some cleaning up of whitespace/punctuation
and text refinements to clarify some things.
 2011-09-01 21:15:06 +12:00
Sam Pohlenz 58b0c97347 assets:precompile should not append asset digests when config.assets.digest is false 2011-09-01 18:01:45 +09:30
Richard Hulse 5421d4d016 pipeline docs - spelling and some whitespace 2011-09-01 18:25:24 +12:00
Guillermo Iguaran 72fea6d2eb Adding reference about ExecJS for CoffeeScript 2011-09-01 01:18:20 -05:00
Guillermo Iguaran fdf2f519bd Add reference to ExecJS in JavaScript Compression section 2011-09-01 01:15:19 -05:00
Guillermo Iguaran 418e321b50 Fixing sass-rails helpers methods examples 2011-09-01 01:01:31 -05:00
Guillermo Iguaran 4ba35dd26b Giving info about what are the defaults for test environment 2011-09-01 00:35:01 -05:00
Santiago Pastorino 3ce3b5b1f1 Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes 
Assets pipeline: fix in manifest location and remove unused code
 2011-08-31 22:51:37 -03:00
Richard Hulse ed1dfaf48d update pipeline docs to reflect new defaults 
Production section has been changed to reflect the
new default of precompilation and using the asset
manifest.

Development has been swapped around to reflect the
new default (debug mode is on).

Other changes to support this elsewhere.
 2011-09-01 13:28:33 +12:00
Guillermo Iguaran fe07669e27 Review config.assets options. 2011-08-31 20:05:59 -05:00
Aaron Patterson c5a91d0288 should be using a / in this route rather than a # 2011-08-31 16:12:26 -07:00
Xavier Noria e851e9e407 Merge branch 'master' of git://github.com/lifo/docrails 2011-08-31 16:10:09 -07:00
Kir 6ce6ba8638 Instructions for nginx and apache added 2011-08-31 16:09:41 -07:00
Richard Hulse f0af563952 Added new asset config options to guides 2011-09-01 11:06:05 +12:00
Greg Leppert 5767c13c68 Update wording surrounding template file extensions to include Rails 3 and above. 2011-08-31 19:39:41 -03:00
Ray Baxter 2422fbf628 make code example agree with text just above 2011-08-31 15:19:06 -07:00
Xavier Noria 27bcd96246 Merge branch 'master' of git://github.com/lifo/docrails 2011-08-31 14:30:25 -07:00
Richard Hulse 054bdc1f59 Add section to pipeline docs to help people upgrading 
These are the options from a brand new app, and
should help people get it right when upgrading.
 2011-09-01 09:11:00 +12:00
Andrew Olson 120b534d8e Fixing spelling, throught -> through. 2011-08-31 14:18:01 -04:00
Guillermo Iguaran 87074600d3 Fix asset debugging tests to reflect last changes in 3-1-stable 2011-08-31 13:12:25 -05:00
Guillermo Iguaran d0b3937b8f Set default location of manifest with config.assets.manifest 2011-08-31 13:12:25 -05:00
Guillermo Iguaran f236e00189 Backport f443f9cb0c to master 2011-08-31 13:12:09 -05:00
Guillermo Iguaran fa04c37f45 Backport b0f3063166 to master 2011-08-31 12:42:54 -05:00
Guillermo Iguaran dffdd82993 Read digests of assets from manifest.yml if config.assets.manifest is on 2011-08-31 12:41:28 -05:00
Vijay Dev d0fafaf20f Merge pull request #2706 from mitio/doc-changes 
Fixed some typos and made minor text changes in the Plugins guide.
 2011-08-31 07:39:48 -07:00
Rodrigo Rosenfeld Rosas 30d65da17e Fix logic in 3.1 release notes sentence 2011-08-31 10:50:08 -03:00
Xavier Noria 47b8415bef Merge branch 'master' of git://github.com/rails/rails 2011-08-31 04:27:59 -07:00
Semyon Perepelitsa 6d772c0953 Fix typo: => instead of = 2011-08-31 14:40:45 +04:00
Xavier Noria e746c4047c syncs assets guide with what's in 3-1-stable 2011-08-31 02:04:36 -07:00
Xavier Noria 19e853275b Merge pull request #2761 from raybaxter/bump_api_url 
don't need edgeapi now that we are on 3.1
 2011-08-31 01:59:00 -07:00
Xavier Noria d7be97ec31 release notes: adds a couple of blank lines to get the markup right 2011-08-31 01:52:43 -07:00
Xavier Noria 73263f6c81 adds the release notes of 3.1 to the index 2011-08-31 01:44:59 -07:00
Ray Baxter 331dad14bc don't need edgeapi now that we are on 3.1 2011-08-30 22:32:09 -07:00
Nicolas Hock Isaza ee822f257e Adding `first_or_new` documentation to the AR Querying guide. 2011-08-30 16:37:13 -05:00
Andrés Mejía 84dad446c6 Adding first_or_create, first_or_create!, first_or_new and first_or_build to Active Record. 
This let's you write things like:

    User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson", :hot => true)

Related to #2420.
 2011-08-30 16:33:37 -05:00
Xavier Noria 2350fecd22 adds the asset pipeline guide to the index 2011-08-30 13:48:16 -07:00
Xavier Noria a7a01b8b8e Merge pull request #2684 from waynn/patch-2 
Rephrasing to sound more natural, and some grammar fixes.
 2011-08-30 13:32:59 -07:00