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
22,857 Commits 34 Branches 105 Tags
b6040f4e84995ce2bdf7b3e20c17efa201685dc5
Commit Graph

22857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vijay Dev
b6040f4e84 fixes Rake::RDocTask deprecation warnings from rake 0.9.0 2011-06-04 09:01:34 +05:30
Vijay Dev
a81c2ec560 fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 2011-06-04 09:01:26 +05:30
wycats
63467a4301 Restructure TemplateAssertions-related code to eliminate circular requires. 
Also, no need to include dependencies in AS::Concerns inside included blocks.
 2011-06-04 08:57:56 +05:30
Yehuda Katz
639dca435f Merge pull request #1473 from lardawge/fix_broken_asset_pipeline_paths 
Fix broken asset pipeline paths
 2011-06-03 18:31:50 -07:00
Larry Sprock
3b75ec92f5 Bring inline with master 2011-06-03 10:55:10 -07:00
Larry Sprock
8b8e18198b Don't need asset_path twice 2011-06-03 10:54:35 -07:00
Larry Sprock
9b55007486 Generate correct asset paths when using asset pipeline 2011-06-03 10:34:49 -07:00
wycats
80745f19c4 Another missed piece of the merge. I screwed up this merge. I am sorry :( 2011-06-03 10:14:02 -07:00
Andrew White
67f5c076de Don't double assign attributes - closes #1467. 2011-06-03 13:58:14 +01:00
wycats
de6394208c Remove explicit sprockets usage. This should have come over in the merge, but for some reason it didn't. 2011-06-02 17:06:34 -07:00
wycats
5b300a9ea4 Pull back in asset_path 2011-06-02 16:10:38 -07:00
wycats
b5ac04a31b Renaming helper in the Rake task, but why is this needed in the first place? (paging JP) 2011-06-02 11:06:04 -07:00
wycats
af83304992 Update generator config to support hiding namespaces and pass the app into generator blocks 2011-06-02 10:59:13 -07:00
wycats
7a8d3d7603 Make sure that Sprockets::Helpers::RailsHelper can be found 2011-06-02 10:59:13 -07:00
wycats
ee018be796 Move the last pockets of Sprockets stuff into the Sprockets directory 2011-06-02 10:59:13 -07:00
wycats
476d679c33 Move javascript/css helpers into the Sprockets helper and just have them override the old behavior 2011-06-02 10:59:13 -07:00
wycats
866889c526 Start moving some logic from being embedded in AV into the Rails Sprockets extensions 2011-06-02 10:59:13 -07:00
David Heinemeier Hansson
2c6127ffd8 Revert "Renaming helper in the Rake task, but why is this needed in the first place? (paging JP)" -- Waiting on YK to fix. 
This reverts commit e144b3e3cf.
 2011-06-02 12:39:31 -05:00
Jon Leighton
03d087d4df Fix broken test. You know, the merge button will be the end of us... 2011-06-01 23:14:09 +01:00
Jon Leighton
1243683913 Merge pull request #1451 from arunagw/3-1-stable 
3-1-stable import to java_import
 2011-06-01 12:42:33 -07:00
Arun Agrawal
42b8fb1667 Import => java_import performance test #jruby 2011-06-02 00:55:15 +05:30
Jon Leighton
df0e2db9d9 Merge pull request #1444 from arunagw/3-1-stable 
Jruby fixes for 3 1 stable
 2011-06-01 11:39:00 -07:00
Arun Agrawal
68fc6baf1b Indented as required. 2011-06-01 23:48:43 +05:30
Arun Agrawal
425c892a8f Fixed tests for JDOM. File From Xml is working now 2011-06-01 23:35:44 +05:30
Arun Agrawal
88813e1cf7 Fixing XMLMini_JDOM 2011-06-01 23:35:44 +05:30
Arun Agrawal
60c9b7bc5c Using java_import instead of import. Need with rake 0.9.0 2011-06-01 23:35:43 +05:30
Arun Agrawal
98cd7ca8ec Loading files if PLATFORM available. 2011-06-01 23:35:43 +05:30
Arun Agrawal
7f34d5bc0b Adding comment 2011-06-01 18:51:03 +01:00
Vishnu Atrai
26d0f42f18 AttributeMethodTest test fix #jruby 2011-06-01 18:51:03 +01:00
Brian Mathiyakom
8a4013ddd0 Fix issue #1272 
Set reverse_order_value when asked to reverse_order().
Do the actual reversal in build_arel.
 2011-06-01 18:30:14 +01:00
Andrew White
f1fe3c2d52 Raise NameError instead of ArgumentError in ActiveSupport::Dependencies 
ActiveSupport::Dependencies now raises NameError if it finds an existing
constant in load_missing_constant. This better reflects the nature of
the error which is usually caused by calling constantize on a nested constant.

Closes #1423
 2011-06-01 01:12:41 +01:00
Jon Leighton
5ca2e57a2f Merge pull request #1437 from joshk/ar_collection_new_alias 
Ar collection new alias
 2011-05-31 15:53:49 -07:00
Jon Leighton
3c09ae786d Merge pull request #1437 from joshk/ar_collection_new_alias 
Ar collection new alias
 2011-05-31 15:49:46 -07:00
Jon Leighton
668767091f Merge pull request #1437 from joshk/ar_collection_new_alias 
Ar collection new alias
 2011-05-31 15:48:13 -07:00
Josh Kalderimis
22b02cb049 added an alias for new to build to the AR collection proxy, this corrects an issue where the collection proxies were not consistent 2011-06-01 00:42:02 +02:00
Andrew White
de7fecbb39 Make MemCacheStore work with Ruby 1.9 and -Ku 2011-05-31 23:20:54 +01:00
Jon Leighton
f4e3b70e9c Ensure that calculations properly override the select value even if it's set in the default scope. Fixes #1395. 2011-05-31 21:12:40 +01:00
Erik Fonselius
c22364b60d Failing test for aggregating on default_scope with select 2011-05-31 21:12:40 +01:00
Jon Leighton
64d7348b98 Only save the record once when calling create! on a collection association. Fixes #1360. 2011-05-31 20:32:55 +01:00
Farley Knight
842043e352 Tests for issue #1360 2011-05-31 20:32:47 +01:00
Jon Leighton
9d179135b0 Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted the branch so I cannot just merge it. 2011-05-31 18:37:37 +01:00
Aaron Patterson
1c42bd5444 Merge pull request #1375 from amatsuda/disable_im_by_default_on_test_31 
Disable IdentityMap by default for ActiveRecord testing on 3-1-stable
 2011-05-28 10:39:11 -07:00
Akira Matsuda
37304e3be9 Disable IdentityMap by default for ActiveRecord testing 
because enabling IM by default will possibly hide some bugs on 3.1 default behavior
 2011-05-28 20:59:33 +09:00
jacott
db05478d92 fixed asset_paths when called from sprockets for relative_url_root 2011-05-28 08:50:00 +02:00
Aaron Patterson
18a2dfbbcf work around bug in the sqlite3 bindings. fixes #1289 2011-05-27 14:12:08 -07:00
Aaron Patterson
c0c9a336be fixing test for mysql2 2011-05-27 11:45:49 -07:00
Aaron Patterson
37b2104109 adding a test for #1322 2011-05-27 11:45:32 -07:00
dmathieu
9cb8a18200 don't raise an exception if the format isn't recognized 
Fixed while traveling to heuruko
 2011-05-27 07:50:44 +02:00
José Valim
3868624c79 Merge pull request #1313 from joshk/deprecation_message_correction 
Deprecation message correction
 2011-05-25 14:56:10 -07:00
Josh Kalderimis
a1936b4a6b correction to the AR::Base#attributes= guard_protected_attributes deprecation message 2011-05-25 23:44:52 +02:00