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
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
David Heinemeier Hansson
7124659f3e
Merge pull request #1221 from sikachu/fix_tests
...
Make sure that we're able to run Action Pack test standalone.
2011-05-22 16:05:36 -07: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
Jon Leighton
d7a910e31e
Fix problem with loading polymorphic associations which have been defined in an abstract superclass. Fixes #552 .
2011-05-22 21:25:02 +01: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
José Valim
8c19ebe553
Merge pull request #1219 from fcheung/db_time_fix
...
Take into account time spent in AR even if a redirect occurs or if it is
2011-05-22 12:08:07 -07: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
4ee7d923e1
Merge pull request #1215 from vatrai/remove_require_tzinfo
...
remove require active_support/tzinfo as file dosent exists #TODO fix
2011-05-22 09:51:54 -07:00
Vishnu Atrai
ab4dbb110d
remove require active_support/tzinfo as file dosent exists #TODO fix
2011-05-22 22:08:05 +05:30
José Valim
06474c1553
Merge pull request #1192 from arunagw/removal_extra
...
No more need rubygems here.
2011-05-22 09:12:27 -07:00
José Valim
ff55924921
Merge pull request #1202 from vatrai/todo_fix
...
Fix todo Time.xmlschema used instead of Time.parse
2011-05-22 06:05:52 -07:00
Vishnu Atrai
9c9f450e4f
require 'time'
2011-05-22 17:16:23 +05:30
José Valim
09fa80dd26
Merge pull request #1193 from arunagw/railties_tests
...
Loading action_controller twice removed.
2011-05-22 04:40:34 -07:00
José Valim
9164dda151
Fix I18n dependency as final is out.
2011-05-22 13:39:13 +02:00
José Valim
62d9c831be
Depend on I18n ~> 0.6
2011-05-22 13:38:00 +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
José Valim
a6e945554d
Fix failing tests.
2011-05-22 13:21:47 +02:00
José Valim
a0eee5f3f2
Merge pull request #1208 from dasch/patch-1
...
Remove superfluous whitespace from ActiveModel::SecurePassword
2011-05-22 04:11:29 -07:00
Daniel Schierbeck
93659a3166
Remove superfluous whitespace from ActiveModel::SecurePassword
...
Only one space is needed, yo!
2011-05-22 04:02:47 -07:00
José Valim
1ab556fa89
Merge pull request #1206 from arunagw/jruby_openssl_load
...
Let's load jruby-openssl now for all. #jruby
2011-05-22 03:57:51 -07:00
José Valim
f924dbe566
Merge pull request #1199 from vatrai/jdon_engine_test_fix
...
test fix jdom_engine_test
2011-05-22 03:48:55 -07:00
José Valim
c932539c5b
Merge pull request #1198 from guilleiguaran/changelog_pluralize_table_names
...
Adding pluralize_table_names change to CHANGELOG
2011-05-22 03:46:32 -07:00
Arun Agrawal
69bad8f517
Let's load jruby-openssl now for all. #jruby
2011-05-22 15:49:30 +05:30
Vishnu Atrai
4fe6d01a3b
Fix todo Time.xmlschema used instead of Time.parse
2011-05-22 11:17:32 +05:30
Vishnu Atrai
7bf9d6f3a8
test fix jdom_engine_test
2011-05-22 10:20:45 +05:30
Guillermo Iguaran
6e5419a0b1
Adding pluralize_table_names change to CHANGELOG
2011-05-21 22:16:34 -05:00
David Heinemeier Hansson
82857adc56
Bump versions for rc1
2011-05-21 20:56:52 -05:00
David Heinemeier Hansson
073f80eaa8
Merge pull request #1195 from dmathieu/try_undefined_method
...
Don't raise NoMethodError the tried method doesn't exists
2011-05-21 17:56:44 -07:00
dmathieu
a85e00c01c
make sure missing method does not fail with arguments
2011-05-22 00:32:58 +02:00
dmathieu
29a5aeaae9
don't raise NoMethodError the tried method doesn't exists
2011-05-21 23:43:12 +02:00
Arun Agrawal
4c99f323ad
Not loading ruby-debug specially.
2011-05-22 03:12:47 +05:30
Arun Agrawal
b85694ff98
Loading action_controller twice removed.
2011-05-22 02:14:17 +05:30
Arun Agrawal
1ffc3063b7
No more need rubygems here.
2011-05-22 02:02:56 +05:30
José Valim
f674aed150
Merge pull request #1191 from arunagw/removal_extra
...
Removal require again from tests.
2011-05-21 13:08:13 -07:00
Arun Agrawal
40e33771e6
Removal require again from tests.
2011-05-22 00:55:12 +05:30
José Valim
f007885a03
Merge pull request #1188 from thedarkone/duplicable-duration
...
Fix AS::Duration#duplicable? on 1.8
2011-05-21 10:42:01 -07:00
Xavier Noria
eb0257944e
Merge pull request #1180 from Karunakar/documentation_change
...
Documentation Error Fixed for ticket #839
2011-05-21 10:39:28 -07:00
David Heinemeier Hansson
f62aba74ef
Now that we are compatible with Rake 0.9.0, lets allow it back in
2011-05-21 12:04:41 -05:00
David Heinemeier Hansson
8b719cf3f7
Merge pull request #1174 from bilts/fix-rake-dsl
...
Make Rake::DSL methods available within Railtie rake_tasks block (so we're compatible with Rake 0.9.0).
2011-05-21 09:57:37 -07:00
Santiago Pastorino
da8469fa7d
Merge pull request #1187 from thedarkone/polymorphic-class-fix
...
Handle polymorphic_type NOT NULL columns
2011-05-21 09:43:42 -07:00
David Heinemeier Hansson
eba978ca50
Uglifier works properly now with 0.5.4
2011-05-21 11:23:54 -05:00
David Heinemeier Hansson
f3c3a785bd
Bind to Rake 0.8.7 until a fix for Rake 0.9.0 is released
2011-05-21 10:56:03 -05:00
Andrew White
09daaaa1e0
Add support for passing mass assignment roles to dynamic finders. Closes #1170 .
2011-05-21 16:33:54 +01:00
