github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,079 Commits 34 Branches 105 Tags
7b4cd4bb5bfd169404d501fde29fe237eeecebfa
Commit Graph

7037 Commits

Author SHA1 Message Date
brainopia
c2687c390f Remove autoload for a couple of constants which don't exist anymore 2011-05-31 06:22:09 +04:00
Lee Reilly
4f234bfd79 Corrected some typos and American vs. Queen's English issues 2011-05-29 12:40:24 -07:00
José Valim
a46b03e728 Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests 
Stringify param values in controller tests.
 2011-05-28 12:43:13 -07:00
Andrés Botero
5a5736d735 Fix typo in test. 2011-05-28 00:51:00 -07:00
jacott
db5adf2d42 fixed asset_paths when called from sprockets for relative_url_root 2011-05-28 18:19:11 +12:00
José Valim
ec08bfc035 Merge pull request #1324 from dmathieu/no_error_on_invalid_format 
Don't raise an exception if the format isn't recognized
 2011-05-26 02:29:23 -07:00
dmathieu
16571f9c42 don't raise an exception if the format isn't recognized 
Fixed while traveling to heuruko
 2011-05-26 11:18:30 +02:00
José Valim
7fd0a6de84 Merge pull request #1311 from kuldarkrabbi/master 
action_view/template/handler.rb has been removed
 2011-05-25 14:15:00 -07:00
Kuldar Krabbi
9a6833378a action_view/template/handler has been removed 2011-05-25 16:59:04 -04:00
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
David Chelimsky
3f0c71c852 use to_param (and change method to name accordingly) 
- exclude Rack::Test::UploadedFile to pass existing tests. Are there any
  other types we're missing?
 2011-05-22 08:13:22 -04: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