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

7026 Commits

Author SHA1 Message Date
Xavier Noria 00e1d0832e Merge branch 'master' of git://github.com/lifo/docrails 
Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb
 2011-05-25 22:48:47 +02:00
tomhuda 74ade51eee Move SCSS generators and default templates from Rails to the Sass Railtie (d435726312601edb3ba6f97b34f562221f72c1f8). 
* Sass gem registers a compressor
* Sass gem registers generators for assets and scaffold
* Create a default stylesheet_engine ("css") for apps that remove the Sass gem
 2011-05-24 16:04:28 -07:00
tomhuda 88cb89056b Change compressor API so that plugins can register default compressors for their stylesheet or JS engines and still allow the user to turn off compression 2011-05-24 16:04:28 -07:00
Josh Kalderimis 21317d8824 corrected the ActionMailer tests which broke due to some code removed from ActionPack 2011-05-25 00:57:50 +02:00
Josh Kalderimis d182b6ee9c removed deprecated methods, and related tests, from ActionPack 2011-05-24 23:38:59 +02:00
Vijay Dev 79e9a2983a fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 2011-05-24 23:39:24 +05:30
Karunakar (Ruby) bfb9f758ae changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme files 2011-05-24 21:12:01 +05:30
Ernie Miller 15baa49871 Redundant condition in compute_asset_host is redundant. 2011-05-24 11:09:59 -04:00
tomhuda 00be5bd75d Remaining cleanup from changes to AssetTagHelper 2011-05-24 00:39:04 -07:00
Dmytrii Nagirniak 8f003de2c7 fix minor spelling mistakes in comments 2011-05-23 22:40:29 -07:00
wycats 9dabbd0cff Make sure that Sprockets::Helpers::RailsHelper can be found 2011-05-23 17:27:57 -07:00
Santiago Pastorino 8e7590c72c Merge pull request #1241 from smartinez87/extra-space 
Remove extra white-space on exception message.
 2011-05-23 17:09:35 -07:00
Sebastian Martinez 05f29ca2c9 Remove extra white-space on some exception messages. 2011-05-23 20:53:18 -03:00
wycats a9f22dc272 Move the last pockets of Sprockets stuff into the Sprockets directory 2011-05-23 16:45:26 -07:00
wycats 76f947edf7 Move javascript/css helpers into the Sprockets helper and just have them override the old behavior 2011-05-23 16:45:26 -07:00
wycats 4b79029490 Start moving some logic from being embedded in AV into the Rails Sprockets extensions 2011-05-23 16:45:26 -07:00
Sebastian Martinez fcdb5dc557 Remove extra white spaces on ActionPack docs. 2011-05-23 20:22:33 -03:00
Jon Leighton d411c85a65 Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required. 2011-05-23 20:25:44 +01:00
Sebastian Martinez b4951b53ff Add entry to AP changelog 2011-05-23 10:03:52 -03:00
José Valim a8b2a895b7 Merge pull request #1228 from fcheung/db_time_fix2 
Take into account time spent in AR even if a redirect occurs or if it is after the render
 2011-05-23 03:11:15 -07:00
Frederick Cheung 8a722e0912 Take into account time spent in AR even if a redirect occurs or if it is after the render 2011-05-23 10:58:43 +01:00
wycats dd8ab4fda5 Bump Rack version 2011-05-22 23:55:08 -07:00
wycats 72c7aec792 Eliminate uninitialized instance variable warning 2011-05-22 23:39:51 -07:00
wycats 0a587eecc9 Prepare the context in URLHelperTest so that there are no required uninitialized instance variables 2011-05-22 23:38:50 -07:00
José Valim 750194340c Merge pull request #1222 from arunagw/sprockets-fixes 
We don't need to load version any more as Sprockets.beta8 is included.
 2011-05-22 23:35:55 -07:00
wycats 7b9f3eb10b Always initialize @title in caching test to avoid uninitialized instance variable warning 2011-05-22 23:14:52 -07:00
wycats ddc584e89e Restructure TemplateAssertions-related code to eliminate circular requires. 
Also, no need to include dependencies in AS::Concerns inside included blocks.
 2011-05-22 23:13:44 -07:00
wycats 0afefa9504 Make :status an attr_reader to avoid unnecessary warning when replacing status= 2011-05-22 22:34:06 -07:00
Arun Agrawal 531095e64e We don't need to load version any more as Sprockets.beta8 is included. 2011-05-23 07:09:09 +05:30
Joshua Peek 5e519fb015 Merge branch '3-1-stable' 
Conflicts:
	actionpack/actionpack.gemspec
	activemodel/activemodel.gemspec
 2011-05-22 20:11:36 -05:00
Joshua Peek 7ad24a7d96 Require sprockets beta 8 2011-05-22 20:10:13 -05:00
David Heinemeier Hansson ba3ea9c90b Revert "Take into account time spent in AR even if a redirect occurs or if it is after the render" because it's causing test failures about missing db_during_render. 
This reverts commit 60b55baca9.
 2011-05-22 18:10:52 -05:00
Prem Sichanugrist 90f028a4dc Make sure that we're able to run Action Pack test standalone. 
Sprocket was trying to look for these two things:

* `Rails::VERSION::STRING`
* `.initializer(str)` in `Rails::Engine`

This commit added require to version.rb into Abstract Unit, and mocking the `Rails::Engine.initializer` in `sprockets_helper_test.rb`
 2011-05-22 19:02:54 -04:00
Joshua Peek 27159dff0f Add debug_asset support 2011-05-22 15:10:53 -05:00
Joshua Peek cdc9c3c4af Lock to stable sprockets beta 2011-05-22 14:50:11 -05:00
Frederick Cheung 60b55baca9 Take into account time spent in AR even if a redirect occurs or if it is after the render 2011-05-22 19:49:31 +01:00
José Valim 9164dda151 Fix I18n dependency as final is out. 2011-05-22 13:39:13 +02:00
José Valim d5646e842f Move I18n dependency back to ActiveSupport. 2011-05-22 13:31:19 +02:00
José Valim 99b5020eb2 Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub 2011-05-22 04:27:28 -07:00
José Valim 2cd2f51ded Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920 
Add method FormHelper#fields_for_with_index
 2011-05-22 04:26:31 -07:00
Anuj Dutta 023ca4fd48 Fixed documentation for scope with path. 2011-05-22 11:27:02 +01:00
David Heinemeier Hansson 82857adc56 Bump versions for rc1 2011-05-21 20:56:52 -05:00
Jorge Bejar 7c562d5e46 Add method fields_for_with_index to FormHelper 2011-05-21 12:06:04 -03:00
José Valim 26703f4905 Merge pull request #1165 from arunagw/rubyforge_remove 
Not updating rubyforge for new versions.
 2011-05-21 04:55:37 -07:00
Andrew White 89d7133082 Correct example and expand on description of :shallow option for resources 2011-05-21 07:11:47 +01:00
José Valim e4bcd5e7eb Merge pull request #1177 from joshk/ruby19_warnings 
Fixed some ruby 19 warnings
 2011-05-20 22:24:49 -07:00
Josh Kalderimis c659505368 fixed some ruby 19 warnings, including circular requires and variable name reuse 2011-05-21 01:23:17 -04:00
José Valim 5eadb4d73d Temporarily ship with ContentLength middleware. 2011-05-20 22:20:51 +02:00
Arun Agrawal f72f591c8c Not updating rubyforge for new versions. Result of "gem list -d rails" is not useful. 2011-05-20 17:43:40 +05:30
Diego Plentz 0d310d590c fixes code highlight in shallow_path example 2011-05-19 17:38:15 -07:00