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
25,547 Commits 34 Branches 105 Tags
e5d0bb22ef6284430fecb608836c8d2b77b56c8d
Commit Graph

3699 Commits

Author SHA1 Message Date
Alexey Vakhov
50d262f52a Support symbol and string actions in AC#respond_to options 2011-10-11 12:48:03 +04:00
Diego Carrion
8f863742e3 allow shorthand routes with nested optional parameters 2011-10-10 19:53:42 -03:00
Denis Odorcic
a0a68ecbb2 JSON responder should return errors with :error root 2011-10-10 01:42:12 -04:00
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
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
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
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
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
Alexey Vakhov
8df7fe3f63 normalize arg for ActionView::TestCase tests method 2011-10-03 14:27:42 +04:00
Alexey Vakhov
8e946daf69 normalize arg for AC::TestCase tests class method 2011-10-03 12:12:07 +04: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
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
Christos Zisopoulos
b8ea31540a Correctly override image_path in sprockets rails_helper 2011-09-26 18:45:49 +02:00
Santiago Pastorino
d6cff93152 Just assert_equal here 2011-09-26 12:20:52 -03:00
Santiago Pastorino
2c3a5075b6 Merge pull request #3135 from christos/respect_assets_digest_value 
Give precedence to `config.digest = false` over the existence of manifest.yml asset digests
 2011-09-26 08:16:02 -07:00
Santiago Pastorino
b855327443 image_tag should use /assets if asset pipelining is turned on. Closes #3126 2011-09-26 11:20:30 -03:00
Christos Zisopoulos
793e9da63d Give precedence to config.digest = false over manifest.yml asset digests 2011-09-26 14:27:04 +02:00
Vijay Dev
541018a07b fix deprecation warning in cookie_store_test 
The options argument to MessageVerifier#initialize should be a hash.
 2011-09-25 23:21:37 +05:30
Evgeniy Dolzhenko
86cf3fb5fa Implement Mime::Type#respond_to? (consistently with #method_missing) 2011-09-25 13:03:01 +01:00
José Valim
933ba0cf6e Merge pull request #3124 from avakhov/patch-6-stylesheet-link 
escape options for the stylesheet_link_tag method
 2011-09-25 04:03:13 -07:00
Alexey Vakhov
5ffa69793f escape options for the stylesheet_link_tag method 2011-09-25 09:40:49 +04:00
Guillermo Iguaran
038808ba1a Add public API for register new js and css compressors for Sprockets 2011-09-24 19:22:13 -05:00
Santiago Pastorino
3de95fd930 Revert "Make process reuse the env var passed as argument" 
This reverts commit 0e4748cd41.
 2011-09-24 17:19:42 -03:00
Santiago Pastorino
5dcb269eb8 Merge pull request #3092 from asee/master 
Sprockets to use config.assets.prefix, with tests
 2011-09-23 09:34:04 -07:00
José Valim
48d27363f2 Fix failing tests and add tests for :formats on partial. 2011-09-23 00:42:20 +02:00
Nick Sutterer
2e3eb2560b Allow both sym and array for details options in #render. using LC#registered_details to extract options. 2011-09-23 00:36:14 +02:00
Nick Sutterer
f8e6664d86 added tests for render :file/:template and the :formats/:handlers/:locale options. 2011-09-23 00:36:10 +02:00
docunext
c070cc4ab4 Fixes #1489 again, with updated code and numerous tests to confirm 2011-09-22 13:43:08 -04:00
José Valim
43d27e9105 Deprecate passing the template handler in the template name. 
For example, calling hello.erb is now deprecated. Since Rails 3.0
passing the handler had no effect whatsover. This commit simply
deprecates such cases so we can clean up the code in later releases.
 2011-09-22 15:37:38 +02:00
José Valim
119e9e2daf Get rid of update_details in favor of passing details to find_template. 2011-09-22 15:03:05 +02:00
Nick Sutterer
cbaad674f1 it is now possible to pass details options (:formats, :details, :locales, ...) to #render, #find_template and friends. this doesn't change anything in global context. 2011-09-22 14:12:36 +02:00
Pawel Pierzchala
019eea4a38 Fix named routes modifying arguments 2011-09-22 09:57:00 +02:00
Santiago Pastorino
da7f0426ec Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation. 2011-09-14 15:02:17 -07:00
Santiago Pastorino
5f28c22722 Merge pull request #2964 from msgehard/silence_warnings 
Silence Ruby warnings about uninitialized instance variable.
 2011-09-14 00:27:45 -07:00
Santiago Pastorino
b0cee70354 Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets 
Set relative url root in assets when controller isn't available for Sprockets
 2011-09-12 23:25:28 -07:00
Guillermo Iguaran
9279d1102c Set relative url root in assets when controller isn't available for Sprockets. Fix #2435 
See https://github.com/rails/sass-rails/issues/42 for details
 2011-09-13 01:02:44 -05:00
Aaron Patterson
a08bee7841 all routes can be stored in the Journey Routes object 2011-09-12 16:50:48 -07:00
Santiago Pastorino
a9509284ca Merge pull request #2974 from md5/csrf_token_warning 
Use ensure instead of rescue
 2011-09-10 17:29:04 -07:00
Mike Dillon
dbef311819 Use ensure instead of rescue 2011-09-10 11:01:22 -07:00
Aaron Patterson
d0946fdd57 Merge pull request #2972 from md5/master 
Use log.warn instead of debug for CSRF token warning
 2011-09-10 10:45:47 -07:00
Mike Dillon
538fb18dea Add test for warning and CHANGELOG entry 2011-09-10 09:51:55 -07:00
Arun Agrawal
abbd27fad8 No need to use </form> here. It's already in whole_form block 2011-09-10 12:22:29 +05:30
Mike Gehard
6c43532cb6 Silence Ruby warnings about uninitialized instance variable. 2011-09-09 15:48:43 -06:00
Aaron Patterson
ac1a363c6e Pull up a method we only use once. 2011-09-08 16:04:57 -07:00