Denis Odorcic
a0a68ecbb2
JSON responder should return errors with :error root
2011-10-10 01:42:12 -04:00
Vijay Dev
a2edc884f3
Merge branch 'master' of github.com:lifo/docrails
2011-10-09 20:10:53 +05:30
Arun Agrawal
ca219a21b6
Warnings removed when running with 1.9.3
2011-10-09 17:15:55 +05:30
José Valim
2ed66feae0
Merge pull request #3262 from subdigital/master
...
Add optional host option to force_ssl
2011-10-09 02:52:42 -07:00
José Valim
501e5b0d7f
Merge pull request #3196 from avakhov/patch-am-av-tests-2
...
Improve tests method for ActionView::TestCase and ActionMailer::TestCase
2011-10-09 02:15:19 -07:00
Liborio Cannici
114218e4da
Fixes an issue when creating a date select with too many options.
...
Inspired by dlt 9e61563474
Closes #239 .
Conflicts:
actionpack/CHANGELOG
2011-10-08 18:02:15 -07:00
Ben Scheirman
d68f27e9b1
accept optional :host parameter to force_ssl
2011-10-08 18:38:02 -05:00
Alexey Vakhov
a4515b60e3
Remove unnecessary dup in expire_page
2011-10-08 11:01:31 +04:00
Alexey Vakhov
22b6e829dc
Fix params hash example in AC::Base comment
2011-10-08 10:12:58 +04:00
Aaron Patterson
7f64e47277
just check to see that the first item in the list is an array
2011-10-07 16:56:18 -07:00
Vijay Dev
0d3d9a150a
closes #3241 - partial doc fix
2011-10-07 23:53:12 +05:30
Vijay Dev
4930f9d2a7
Merge branch 'master' of github.com:lifo/docrails
2011-10-07 22:20:29 +05:30
Aaron Patterson
99888487b6
fix require
2011-10-06 15:31:56 -07:00
Alexey Vakhov
d42d97d2e3
Fix comment in AbstractController callbacks
2011-10-06 10:39:37 +04:00
Santiago Pastorino
fd8f0b2978
stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't throw Sprockets::FileOutsidePaths exception anymore
2011-10-05 15:41:28 -02:00
José Valim
c495bfc127
Do not require railtie as it messes up Rails.application setup.
2011-10-05 15:31:38 +02:00
Vijay Dev
46ce7f1f77
Merge branch 'master' of github.com:lifo/docrails
2011-10-05 18:42:18 +05:30
José Valim
4cea4ee6b5
Fix regression when calling helpers inside sprockets.
2011-10-05 09:37:58 +02:00
José Valim
87c57bb88f
Fix the lame config.action_controller.present? check scattered throughout assets_path.
...
Conflicts:
actionpack/test/template/sprockets_helper_test.rb
2011-10-05 02:35:43 +02:00
José Valim
5711a35ad8
Ensure default_asset_host_protocol is respected, closes #2980 .
2011-10-05 02:08:02 +02:00
José Valim
ac2f6bd643
Encapsulate common rake invocation logic in a method.
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-10-05 01:25:55 +02:00
Mark J. Titorenko
110ce85482
added comment about why nondigest assets requires a reinvocation
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-10-05 01:25:47 +02:00
Mark J. Titorenko
26a62a6552
only reinvoke if necessary
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-10-05 01:25:39 +02:00
Mark J. Titorenko
42eda8f8a1
only execute the nondigest task if needed
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-10-05 01:25:05 +02:00
Mark J. Titorenko
ee51cc30ff
don't munge the environment, let rake do that for us
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-10-05 01:25:01 +02:00
Mark J. Titorenko
b41bd968c6
assets compilation task refactoring
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-10-05 01:24:58 +02:00
José Valim
dc85fc546f
Fix failing test added in previous commit.
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-10-04 22:04:56 +02:00
Santiago Pastorino
db262211c9
Bump sprockets to 2.0.2
2011-10-04 14:14:36 -02:00
José Valim
96aa3bd0ea
Clean up subdomain code a bit.
2011-10-04 11:31:47 +02:00
José Valim
b039069756
Merge pull request #3209 from ksob/subdomain_false_strips_subdomains
...
:subdomain => false will remove all subdomains now. Closes #2025
2011-10-04 02:26:40 -07:00
José Valim
7f1a666db5
Fix failing tests and refactor assets.rake
2011-10-04 11:25:36 +02:00
Kamil Sobieraj
de942e5534
:subdomain can now be specified with a value of false in url_for, allowing for subdomain(s) removal from the host during link generation. Closes #2025
2011-10-04 09:16:34 +01:00
Brendan Ribera
b05a56f47d
Require rack-cache 1.1.
...
Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified headers when
config.action_controller.perform_caching is true. This has two problems:
* unexpected inconsistent behaviour between development & production environments
* breaks applications that use of these headers
2011-10-03 11:32:24 -07:00
José Valim
2120d7b838
Fix #3198 .
2011-10-03 13:38:02 -02:00
Alexey Vakhov
8df7fe3f63
normalize arg for ActionView::TestCase tests method
2011-10-03 14:27:42 +04:00
Sam Pohlenz
6f429f375e
Ensure that enhancements to assets:precompile task are only run once
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-10-03 11:18:49 +02:00
José Valim
9c6d4801d1
Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantize
...
use safe_constantize instead constantize in AC::TestCase
2011-10-03 02:10:40 -07:00
Alexey Vakhov
8e946daf69
normalize arg for AC::TestCase tests class method
2011-10-03 12:12:07 +04:00
Alexey Vakhov
f51cb36fe9
missed underscore in AV::TestCase helper_method documentation
2011-10-03 10:36:13 +04:00
Alexey Vakhov
0eb80fabdd
use safe_constantize instead constantize in AC::TestCase
2011-10-03 10:04:14 +04:00
José Valim
d68884f4fd
:group => :assets should only run in the assets environment.
2011-10-02 22:08:33 +02:00
José Valim
753424079e
Provide initialize_on_precompile which, when set to false, does not initialize the app for precompilation. Defaults to true.
2011-10-02 12:15:21 +02:00
José Valim
6e8fe1bf02
TestCase should respect the view_assigns API instead of pulling variables on its own.
2011-10-02 11:29:13 +02:00
Arun Agrawal
b30ffbbfd6
Use of :: in void context Warning removed
2011-10-01 14:27:12 +05:30
Santiago Pastorino
d2888de598
Add CHANGELOG entries
2011-09-29 16:49:31 -03:00
Santiago Pastorino
64b0c8888b
javascript_path and stylesheet_path should honor the asset pipelining
2011-09-28 20:13:24 -03:00
Wen-Tien Chang
3058d13a06
Make button_to helper support "form" option which is the form attributes.
2011-09-29 01:40:15 +08:00
Alexey Vakhov
1bd88fdafd
add missing require to html sanitizer
2011-09-27 23:39:52 +04:00
Santiago Pastorino
e97b6f2ef7
Merge pull request #3138 from christos/correct_image_path_with_pipeline
...
Correctly override image_path in sprockets rails_helper
2011-09-26 10:02:02 -07:00
Santiago Pastorino
cf90181d84
Merge pull request #3136 from guilleiguaran/clear-digests-on-precompile
...
Avoid use of existing precompiled assets during rake assets:precompile run
2011-09-26 13:57:07 -03:00