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
24,762 Commits 34 Branches 105 Tags
28a4d378431168a7df1ef561237ecdb4bb6da161
Commit Graph

24762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Leighton
28a4d37843 Merge pull request #2674 from masterkain/master 
Add back autoload :Table
 2011-08-24 14:33:09 -07:00
Santiago Pastorino
e7634c2fdd Merge pull request #2677 from guilleiguaran/refactor-sprockets-helpers 
Refactoring javascript_include_tag and stylesheet_link_tag Sprockets helpers
 2011-08-24 14:11:35 -07:00
Guillermo Iguaran
23b5c55221 Preserve stylesheet_link_tag and javascript_include_tag options on debug 2011-08-24 16:01:06 -05:00
Guillermo Iguaran
e0db9cb17d Use super in javascript_include_tag and stylesheet_link_tag instead of generate tags manually 2011-08-24 15:54:47 -05:00
Guillermo Iguaran
c5a52850b3 Remove redundant join and call to html_safe 2011-08-24 15:40:10 -05:00
Aaron Patterson
09e2109686 bumping bcrypt-ruby requirement 2011-08-24 13:26:38 -07:00
Aaron Patterson
44f07098fe dealing with some -w warnings on startup 2011-08-24 13:25:11 -07:00
José Valim
2f88743c30 Merge pull request #2675 from jdelStrother/load_once_pathnames_fix 
Fix autoload_once_paths when using Pathnames & ruby 1.9
 2011-08-24 10:29:16 -07:00
Claudio Poli
098cc186c1 Adding missing autoload 2011-08-24 19:15:49 +02:00
Jonathan del Strother
e0714ee005 Fix autoload_once_paths when using Pathnames & ruby 1.9 
Under ruby 1.9.2 -
  "/var/log".starts_with?(Pathname.new("/var"))  # => false

so setting config.autoload_once_paths with Pathnames would not work
 2011-08-24 18:14:25 +01:00
Santiago Pastorino
289540e4ff Revert "Simplify JavaScriptHelper#escape_javascript" 
This commit broke the build without any improvement.

This reverts commit eb0b71478a.
 2011-08-24 13:22:37 -03:00
Joshua Peek
5493d22419 Bring in sprockets precompile task 2011-08-24 10:58:43 -05:00
Santiago Pastorino
976b2be108 Merge pull request #2644 from guilleiguaran/allow-assets-debugging 
Add config.allow_debugging option
 2011-08-24 08:01:08 -07:00
Guillermo Iguaran
827cdae6fb Add config.allow_debugging option to determine if the debug_assets query param can be passed by user 2011-08-24 09:53:55 -05:00
Santiago Pastorino
23d8a980d2 Merge pull request #2668 from guilleiguaran/debug-assets-media-type 
Debug assets shouldn't ignore media type for stylesheets. Closes #2625
 2011-08-24 07:46:04 -07:00
Santiago Pastorino
52207ecc81 Merge pull request #2390 from arunagw/test_for_environment_file 
Test added to check development.rb, test.rb and production.rb content
 2011-08-24 07:22:43 -07:00
Santiago Pastorino
f162f84aa5 Merge pull request #2647 from dmathieu/no_rescue 
remove useless rescue
 2011-08-24 07:02:03 -07:00
Santiago Pastorino
61e663073a Merge pull request #2669 from BMorearty/remove-extra-word 
docs: Remove extra word from sentence in initialization guide.
 2011-08-24 05:49:26 -07:00
Daniel Schierbeck
eb0b71478a Simplify JavaScriptHelper#escape_javascript 
Use the Linus-style conditional. Also fix the documentation slightly.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
 2011-08-24 11:36:45 +01:00
Damien Mathieu
13dd7758ce remove useless rescue 
params is a method, defined in every controller, which always returns a hash.
If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about.
 2011-08-24 09:52:00 +02:00
Brian Morearty
11146f1485 Remove extra word from sentence in initialization guide. 2011-08-23 21:34:43 -07:00
Guillermo Iguaran
d133fd6d29 Debug assets shouldn't ignore media type for stylesheets. Closes #2625 2011-08-23 21:36:21 -05:00
Aaron Patterson
29004de1a2 load should also return the value from super 2011-08-23 17:04:05 -07:00
Aaron Patterson
a10606c490 require needs to return true or false. thank you Ryan "zenspider" Davis 2011-08-23 16:55:43 -07:00
David Heinemeier Hansson
4cc934993e Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore 
Add .rbenv-version to .gitignore
 2011-08-23 16:33:06 -07:00
David Majda
68a13eded3 Make ActionController::TestCase#recycle! set @protocol to nil 
This ensures that the protocol does not get carried over when there are
two or more requests in functional tests. This was a problem when e.g.
the first request was HTTP and the second request was HTTPS.

Closes #2654.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
 2011-08-23 15:34:11 +01:00
Andrew White
ebea387e4b Add failing test case for #2654 2011-08-23 15:33:59 +01:00
Andrew White
13400ac289 Ensure regexp and hash key are UTF-8 2011-08-23 14:56:04 +01:00
Xavier Noria
f7f9003cd5 Merge pull request #2616 from tilsammans/patch-2 
Removed my name from the changelog as the amount of blogspam became ridic
 2011-08-23 05:27:11 -07:00
Joost Baaij
707378c489 removed the link to my blog to help stop endless comments 2011-08-23 14:18:06 +02:00
Joost Baaij
c46befbce3 Revert "Removed my name from the changelog as the amount of blogspam became ridiculous. " 
This reverts commit 95bece9155.
 2011-08-23 14:17:29 +02:00
Xavier Noria
45f8ca54c9 Merge pull request #2653 from luckydev/ser-wrap 
Missing require array/wrap in serialization
 2011-08-23 04:05:34 -07:00
Xavier Noria
eb18f3d746 Merge pull request #2652 from dasch/remove-trailing-whitespace 
Remove trailing whitespace
 2011-08-23 04:00:59 -07:00
Anand
1be3442a0a added missing require array/wrap in serialization 2011-08-23 16:30:02 +05:30
José Valim
5536d901e5 Merge pull request #2651 from luckydev/serialization-tests 
More tests for only-include and except-include options in serialization
 2011-08-23 03:55:24 -07:00
Daniel Schierbeck
cacdbb9437 Remove trailing whitespace 2011-08-23 12:39:07 +02:00
Anand
56e32ad40f added more tests for only-include and except-include options in serialization 2011-08-23 16:03:58 +05:30
Andrew White
14cf4b2e35 Don't modify params in place - fixes #2624 2011-08-23 11:07:37 +01:00
Aaron Patterson
7079701e5b Merge pull request #2646 from guilleiguaran/add-destroy-alias-to-engine 
Add destroy alias to engines
 2011-08-22 22:54:42 -07:00
Guillermo Iguaran
d17954c7d8 Add destroy alias to engines 2011-08-22 23:39:17 -05:00
Santiago Pastorino
0b6da0c654 Merge pull request #2411 from ai/debug_assets_by_config 
Debug assets by config
 2011-08-22 11:50:27 -07:00
Aaron Patterson
999e7ea47d Merge pull request #2627 from luckydev/tr 
travis status image added
 2011-08-22 11:29:01 -07:00
Aaron Patterson
d7ec3ee9ae Merge pull request #2611 from ognevsky/add-destroy-alias 
Added destroy alias to rails generator
 2011-08-22 11:28:26 -07:00
Santiago Pastorino
0942879a52 Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251 
Use mysql_creation_options inside rescue block
 2011-08-22 10:36:12 -07:00
Joshua Peek
cfb5e14f5d Merge pull request #2634 from guilleiguaran/fix-sprockets-rewrite-asset-path 
Fix Sprockets rewrite_asset_path
 2011-08-22 10:24:16 -07:00
Anand
71232f5d5d Travis status image added to GitHub README, excluding API pages. 2011-08-22 22:28:02 +05:30
Guillermo Iguaran
e1f11ff37f Fix Sprockets rewrite_asset_path 2011-08-22 11:12:54 -05:00
Santiago Pastorino
041f1c7192 Merge pull request #2631 from dasch/refactor-sprockets 
Refactor Sprockets::Helpers::RailsHelper#performing_caching?
 2011-08-22 08:11:35 -07:00
Daniel Schierbeck
db181bddb6 Refactor Sprockets::Helpers::RailsHelper#performing_caching? 
No need for them lines to get so long! Also, move that comment into
the method body where it belongs!
 2011-08-22 16:50:33 +02:00
Andrey Ognevsky
44f0d94469 Add Destroy Alias 
* Added destroy alias to rails generator

* add alias info for destroy command

* Updated command line guides
 2011-08-22 17:46:10 +03:00