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,169 Commits 34 Branches 105 Tags
425362da31db52dfc50d4e25d6ecf2fea1353a4e
Commit Graph

7533 Commits

Author SHA1 Message Date
Santiago Pastorino
425362da31 Merge pull request #3012 from guilleiguaran/3-1-1-changelogs 
Add missing changelog entries for actionpack
 2011-09-14 00:58:44 -07:00
Santiago Pastorino
0d48b3afa9 Revert "Provide a way to access to assets without using the digest, useful for static files and emails" 
This reverts commit 82afaa0686.
 2011-09-14 00:29:03 -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
Guillermo Iguaran
fae70cb6bc Add missing changelog entries for actionpack 2011-09-13 19:40:47 -05:00
Mark J. Titorenko
f22407dd34 Don't mount Sprockets at config.assets.prefix if config.assets.compile is false. 2011-09-13 18:16:52 -05:00
Santiago Pastorino
82afaa0686 Provide a way to access to assets without using the digest, useful for static files and emails 2011-09-13 15:18:21 -07:00
Santiago Pastorino
ae04fbfee9 Fix asset_path relative_url_root method 2011-09-13 02:45:05 -07:00
Guillermo Iguaran
f509b6988b Fix for relative url root in assets 2011-09-13 04:27:30 -05:00
Santiago Pastorino
5bad79d930 always rewrite_relative_url_root 2011-09-13 00:27:29 -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
Santiago Pastorino
038e45a2b6 Merge pull request #2987 from kennyj/master 
fix https://github.com/rails/rails/issues/2947 (with testcase)
 2011-09-12 23:04:14 -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
f65b2215cd removing backwards compatibility module 2011-09-12 16:50:49 -07:00
Aaron Patterson
ea7ef9597e partially expand the parameters to match 2011-09-12 16:50:49 -07:00
Aaron Patterson
ad1a891649 unfactor the Route class to private factory methods 2011-09-12 16:50:49 -07:00
Aaron Patterson
943aa826a4 reduce dependencies of external objects in the Route class 2011-09-12 16:50:49 -07:00
Aaron Patterson
f5ab6805ed delete unused code, pass path explicitly to journey 2011-09-12 16:50:49 -07:00
Aaron Patterson
a08bee7841 all routes can be stored in the Journey Routes object 2011-09-12 16:50:48 -07:00
Aaron Patterson
b7ccfa96d2 clear! does not need to be called from initialize 2011-09-12 16:50:48 -07:00
Aaron Patterson
59b9fe961d reuse the route collection and formatter by clearing them 2011-09-12 16:50:48 -07:00
Aaron Patterson
4ffe667ab7 Instantiate each part of our routing system: 
* A collection of Routes
  * The Router, which consults the collection of routes
  * A formatter that consults the collection of routes
 2011-09-12 16:50:48 -07:00
Aaron Patterson
537ed6eb2f stop freezing the routes 2011-09-12 16:50:47 -07:00
Aaron Patterson
a05a9ff1ca stop using a hash for parameterizing 2011-09-12 16:50:47 -07:00
Aaron Patterson
5f0b37c486 Switching rack-mount to journey. 2011-09-12 16:50:47 -07:00
Guillermo Iguaran
f746927889 Remove odd asignation 2011-09-12 13:16:55 -05:00
kennyj
21eaba4c39 fix https://github.com/rails/rails/issues/2947 (with testcase) 2011-09-13 02:59:57 +09:00
Santiago Pastorino
d762e22c04 Merge pull request #2985 from kennyj/master 
fix https://github.com/rails/rails/issues/2582 (with testcase)
 2011-09-12 10:18:19 -07:00
kennyj
3ce830272e fix https://github.com/rails/rails/issues/2582 (with testcase) 2011-09-13 01:06:31 +09: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
e7e6515146 Fix changelog entry 2011-09-10 09:54:57 -07:00
Mike Dillon
538fb18dea Add test for warning and CHANGELOG entry 2011-09-10 09:51:55 -07:00
Mike Dillon
7fb99e5743 Change log level for CSRF token verification warning 2011-09-10 08:31:04 -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
Santiago Pastorino
be24be62b6 Merge pull request #2876 from alex3/patch-1 
Fixed assets precompile regex
 2011-09-09 21:56:28 -07:00
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
Aaron Patterson
41a085ebc9 Conditions must never be equal 2011-09-08 16:04:57 -07:00
Alex Yakoubian
901c02d86a Fixed assets precompile regex, now accepts Procs 2011-09-08 13:44:08 -07:00
Vijay Dev
0d25491581 Merge branch 'master' of github.com:lifo/docrails 2011-09-08 18:06:43 +05:30
Nicolás Hock Isaza
ea83a8da31 Fixing record_key_for_dom_id documentation. 
The default implementation joins everything with '_' and not with '-'
 2011-09-07 08:19:39 -05:00
Jon Leighton
16f1ce41d5 Merge pull request #2499 from akaspick/assert_select_email_fix 
Fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors.
 2011-09-07 05:51:31 -07:00
Nicolás Hock Isaza
9821d982ff Fixing record_key_for_dom_id documentation. 
The default implementation joins everything with '_' and not with '-'
 2011-09-06 23:26:56 -05:00
Aaron Patterson
f6ced69a11 Eliminate newlines in basic auth. fixes #2882 2011-09-06 17:25:20 -07:00
Santiago Pastorino
ef14a0ec86 Merge pull request #2577 from rails-noob/master 
Fix double slash at start of paths when mounting an engine at the root.
 2011-09-06 09:10:39 -07:00
Santiago Pastorino
1e61f2603c Merge pull request #2889 from guilleiguaran/perform-caching-assets 
config.action_controller.perform_caching isn't used anymore in asset pipeline
 2011-09-06 09:03:52 -07:00
Guillermo Iguaran
6fc518e2ec config.action_controller.perform_caching isn't used anymore in assets pipeline, instead we are using config.assets.digest now 2011-09-06 10:46:52 -05:00
rails-noob
43fbb1e6b8 Fix bug #2579. 
Avoids double slash at start of paths when mounting an engine at the root.
 2011-09-06 15:26:19 +00:00
Jon Leighton
1fdd95d084 Merge pull request #2851 from dasch/patch-6 
No need to use a begin block there
 2011-09-06 02:50:27 -07:00