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,665 Commits 34 Branches 105 Tags
0cd93a6e2bbcdd2ead0d6e4b739dfd8def04d8d5
Commit Graph

7650 Commits

Author SHA1 Message Date
Vijay Dev
af1b5c54cf Merge branch 'master' of github.com:lifo/docrails 2011-10-20 23:20:44 +05:30
Marc Bowes
951a325c99 Remove the unneeded \d when sanitizing X-Request-Id. 2011-10-20 10:00:42 +03:00
José Valim
4ef7453694 Load object/blank and make use of presence. 2011-10-19 22:10:43 +02:00
José Valim
f1fecd9b4e Make tests run on 1.8.x, add integration setup. 2011-10-19 22:09:36 +02:00
David Heinemeier Hansson
ada78066fd Blah, SecureRandom#uuid is not supported in 1.8.7 -- cant wait for Rails 4.0 to drop compatibility with 1.8.x 2011-10-19 14:45:42 -05:00
José Valim
1b50207ed3 Require missing string access dependency. 2011-10-19 22:17:54 +03:00
José Valim
ddbb2cae31 Require securerandom as it is the proper dependency. 2011-10-19 22:15:25 +03:00
David Heinemeier Hansson
afde6fdd5e Added X-Request-Id tracking and TaggedLogging to easily log that and other production concerns 2011-10-19 12:59:33 -05:00
Alexey Vakhov
bed5825f77 Remove superfluous assignment in cookies 2011-10-18 22:57:55 +04:00
Arun Agrawal
124bb17638 Bump Rack to 1.3.5 2011-10-18 11:09:59 +05:30
Alexey Vakhov
8f473dc9ae HTMl -> HTML: html scanner comment fix 2011-10-15 23:54:26 +04:00
Alexey Vakhov
f247c5f811 Update AC::RecordIdentifier example 2011-10-15 11:34:33 +04:00
Vijay Dev
e759c8882a Merge branch 'master' of github.com:lifo/docrails 2011-10-14 22:21:40 +05:30
Jeremy Kemper
401d00d296 Symbol captures may generate multiple path segments, so don't escape / -> %2F. Test splat escaping. 2011-10-13 21:42:15 -07:00
Jeremy Kemper
bceec4c3c3 / is allowed in URI fragments 2011-10-13 21:41:30 -07:00
Jeremy Kemper
ec37160664 Leave escaping up to Journey 2011-10-13 21:40:42 -07:00
Jeremy Kemper
45ced7e1be Failing tests for path parameter escaping 2011-10-13 19:02:58 -07:00
Santiago Pastorino
a5b0f914f1 Merge pull request #3314 from macmartine/master 
Remove user-specified delimiter from start when no area code is present (in number_to_phone)
 2011-10-13 16:26:55 -07:00
Santiago Pastorino
8f11d53506 Merge pull request #2219 from kommen/fix_fragment_caching_squashed 
Fix fragment caching (squashed commits)
 2011-10-13 13:36:20 -07:00
Mac Martine
20728f551c remove user-specified delimiter from start when no area code is present (in number_to_phone) 2011-10-12 17:06:44 -07:00
José Valim
2cb2ca68b1 Add some implementation docs. closes #3298. closes #2509. 2011-10-12 09:29:40 +02:00
Akira Matsuda
4a025f0080 status is a number in Rails 3 2011-10-12 15:44:19 +09:00
Alexey Vakhov
50d262f52a Support symbol and string actions in AC#respond_to options 2011-10-11 12:48:03 +04:00
Alexey Vakhov
419d4c09df Add ActionController#head example 2011-10-11 12:31:27 +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
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