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,954 Commits 34 Branches 105 Tags
8bffd6c6aeee8351d2a52257cf235ccd08f7fd06
Commit Graph

24954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santiago Pastorino
8bffd6c6ae Merge pull request #2863 from raybaxter/silence_unitialized_instance_variable_warnings 
Silence unitialized instance variable warnings
 2011-09-04 20:37:02 -07:00
Ray Baxter
fa0ebf4c98 Tests shouldn't produce warnings 2011-09-04 20:27:53 -07:00
Santiago Pastorino
1e13fac0cc Merge pull request #2861 from guilleiguaran/assets-fix-changelog 
Add entry about Asset behaviour fix to ActionPack ChangeLog
 2011-09-04 19:01:46 -07:00
Guillermo Iguaran
81d715742a Add entry about Asset behaviour fix to ActionPack ChangeLog 2011-09-04 20:35:40 -05:00
Santiago Pastorino
6521cf3316 Merge pull request #2860 from guilleiguaran/fix-assets-behavior 
Fix AssetNotPrecompiledError behavior
 2011-09-04 15:41:13 -07: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
Santiago Pastorino
a1fa756e17 * is not allowed in windows file names. Closes #2574 #2847 2011-09-04 17:44:48 -03:00
Jon Leighton
6c46506067 Merge pull request #2855 from arunagw/fix_find_in_batches_master 
We need to recorder here. Need to drop the order from default scope.
 2011-09-04 13:39:28 -07:00
Arun Agrawal
9066e34025 We need to recorder here. Need to drop the order from default scope. 
Fixes #2832
 2011-09-05 00:12:57 +05:30
Jon Leighton
e865d12543 Merge pull request #2852 from milandobrota/remove_unneeded_explicit_nil_checks 
if ... nil? is more expensive than unless
 2011-09-04 09:05:45 -07:00
Milan Dobrota
9b08afd2f4 if ... nil? is more expensive than unless 2011-09-04 10:44:08 -05: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
Jon Leighton
74372f7e79 Merge pull request #2848 from arunagw/jruby_activesupport_fix 
Need to have a check here for JAVA PLATFORM for JRuby
 2011-09-04 03:11:45 -07:00
Arun Agrawal
fc5e3ff1ba We can't simply check the first line of the backtrace, 
because JRuby reports the call to __send__ in the backtrace.
 2011-09-04 15:33:58 +05:30
Jon Leighton
ef7e60f008 Revert "Fixes bug in ActiveRecord::QueryMethods, #1697" 
This reverts commit 0df27c98d9.

Reverted due to failing test, see #2845.
 2011-09-04 09:56:55 +01:00
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
Guillermo Iguaran
479c853b3f Merge pull request #64 from rinaldifonseca/master 
Added |t| to create_table block
 2011-09-03 21:03:28 -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
Santiago Pastorino
60b8bfa653 Merge pull request #2844 from arunagw/warnings_removed_master 
Warnings removed from master
 2011-09-03 20:17:07 -07: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
Santiago Pastorino
510a9707d8 Merge pull request #2835 from guilleiguaran/actionpack-changelog 
Include ticket numbers in AP CHANGELOG
 2011-09-03 19:13:47 -03:00
Vijay Dev
9da07d1b01 Merge pull request #2836 from avakhov/action-controller-helpers-desc 
fix helpers behavior description
 2011-09-03 13:17:16 -07:00
Alexey Vakhov
19ec3c1ae6 fix helpers behavior description 2011-09-03 23:13:40 +04:00
Aaron Patterson
8a9f4c6da4 Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments 
Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile
 2011-09-03 10:14:11 -07:00
Aaron Patterson
867c830603 Merge pull request #2824 from arunagw/bcrypt_fix 
Need to add here to pass the test
 2011-09-03 10:12:39 -07:00
Arun Agrawal
bf4117a8b1 Need to add here to pass the test 
As in previous commit it's removed.
 2011-09-03 14:33:27 +05:30
José Valim
d50c0acc95 Merge pull request #2827 from sikachu/extractable_ordered_hash 
Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!
 2011-09-03 01:25:44 -07:00
Prem Sichanugrist
9984266c04 Make ActiveSupport::OrderedHash extractable when using Array#extract_options! 
`ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.
 2011-09-03 14:43:33 +07:00
Guillermo Iguaran
9b02f3f41f Add comments about bcrypt-ruby gem to SecurePassword 2011-09-03 00:44:33 -05:00
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
Guillermo Iguaran
6779064437 Remove hard dependency on bcrypt. 2011-09-02 10:01:47 -07:00