Commit Graph

8514 Commits

Author SHA1 Message Date
Trevor Turk
c0b1eb112f Fix permanent cookie jar accessor typo 2013-04-02 18:20:24 -05:00
Sam Ruby
04cda1848c Prefer find_by over dynamic finders in rdoc 2013-04-02 15:09:15 -04:00
Trevor Turk
ca58bf1543 Improve documentation around the cookie store auto-upgrade to encryption 2013-04-01 11:38:06 -05:00
Santiago Pastorino
f9d23b3848 Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade
Cookie-base session store auto-upgrade
2013-04-01 08:10:34 -07:00
ogawaso
d4d3d05d64 typo recomend -> recommend 2013-04-01 19:54:46 +09:00
Carlos Antonio da Silva
0a16cf19c2 Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select
Revert grep to select since they are not the same
2013-03-31 15:46:48 -07:00
Steve Klabnik
2f53c27b81 Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get
remove unused variable and assignment
2013-03-31 08:53:01 -07:00
Steve Klabnik
fb613cb5d1 Merge pull request #10014 from vipulnsward/remove_unused_match_var
remove unused match variables in selector
2013-03-31 08:42:43 -07:00
Vipul A M
f23e7eba52 remove unused variable and assignment 2013-03-31 19:34:40 +05:30
Vipul A M
01ac925b78 remove unused match variables in selector 2013-03-31 19:08:40 +05:30
Vipul A M
1f84997621 fix wrong argument error message 2013-03-31 16:49:23 +05:30
Carlos Antonio da Silva
0c5552a3dd Fix typos in AP: "overriden" => "overridden" 2013-03-30 15:17:08 -03:00
Vijay Dev
6d8c070821 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/adapter_test.rb
	guides/source/testing.md

[ci skip]
2013-03-30 15:46:14 +05:30
Trevor Turk
274a3aa64c Allow transparent upgrading of legacy signed cookies to encrypted cookies; Automatically configure cookie-based sessions to use the best cookie jar given the app's config 2013-03-28 14:38:36 -05:00
Anupam Choudhury
a895b4087d Fixed grammar 2013-03-28 16:43:14 +05:30
Brian McManus
1cc991bef8 Revert grep to select since they are not the same
A previous commit swapped out a call to select for a call to grep in
time_zone_options_for_select. This behavior actually causes the
regexp priority option to stop working.

ActiveSupport::TimeZone overrides the =~ operator which is what the
select block was using previously. Enumerable#grep
checks pattern === element and in this case that would be /US/ ===
ActiveSupport::TimeZone which does not work because
ActiveSupport::TimeZone does not supply an implicit converting to_str
method, only an explicit to_s method.

It would be impossible to provide a to_str method that behaves
identically to the =~ method provided on ActiveSupport::TimeZone
so the only option is to revert back to using select with =~.
2013-03-27 14:10:25 -07:00
Rafael Mendonça França
e7438501d6 Merge pull request #8458 from lucisferre/improve-layout-override-fallback-behavior
Provides standard layout lookup behavior for method and proc cases

Conflicts:
	actionpack/CHANGELOG.md
2013-03-27 16:09:12 -03:00
Chris Nicola
ef27bba63d Provides standard layout lookup behavior for method and proc cases
When setting the layout either by referencing a method or supplying a
Proc there is no way to fall back to the default lookup behavior if
desired. This patch allows fallback to the layout lookup behavior when
returning nil from the proc or method.
2013-03-27 10:59:50 -07:00
Carson McDonald
1595ab6c89 Fix typo 2013-03-26 10:42:45 -04:00
Neeraj Singh
d36cfa2231 if cookie is tampered with then nil is returned [ci skip]
if the given key is not found then verifier does raise
`ActiveSupport::MessageVerifier::InvalidSignature` exception
but this exception is resuced and finally nil is returned.
2013-03-25 11:02:38 -04:00
Trevor Turk
0190cba99c Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4 2013-03-24 18:20:24 -05:00
Jeremy Kemper
822dd1340d Merge pull request #9704 from trevorturk/warn-about-skipped-routes
Raise an ArgumentError when a clashing named route is defined
2013-03-24 12:55:43 -07:00
Vipul A M
a8df5bdc5d Fix some typos 2013-03-24 19:05:41 +05:30
Rafael Mendonça França
e600384515 Merge pull request #8501 from charliesome/version-to-s
Add #to_s method to VERSION modules
2013-03-23 18:51:16 -07:00
Rafael Mendonça França
9e8b7d9d5b Fix documentation markup [ci skip] 2013-03-23 15:38:11 -03:00
Arun Agrawal
28afe45519 StringIO is not required by default in JRuby 2013-03-22 15:17:54 +01:00
ma2gedev
6f9baaec79 Remove duplicated accepts_nested_attributes description
there are just the same description about accepts_nested_attributes [ci skip]
2013-03-22 01:04:54 +09:00
Charlie Somerville
c07e1515f7 Add version method to top level modules 2013-03-21 19:56:07 +11:00
Rafael Mendonça França
066907d1cb Merge pull request #9802 from newsline/fix-broken-action-missing
Fix missing action_missing

Conflicts:
	actionpack/CHANGELOG.md
2013-03-20 18:14:41 -03:00
Trevor Turk
1a25ebf884 Tweak exception message to avoid giving potentially misleading suggestions 2013-03-20 12:48:35 -05:00
Janko Luin
0dfa6cb97c Fix broken ActionController#action_missing
A recent change introduced the assumption that all controller actions
are known beforehand, which is not true when using action_missing.
2013-03-20 08:20:54 +01:00
Trevor Turk
a2b7c0e69d Raise an ArgumentError when a clashing named route is defined 2013-03-19 23:23:55 -05:00
Andrew White
730f725509 Merge pull request #9794 from schneems/schneems/email-host
Fix improperly configured host in generated urls
2013-03-19 18:48:49 -07:00
Carlos Antonio da Silva
bdf1a2e7b9 Remove mentions of "app" from http request docs [ci skip] 2013-03-19 20:46:42 -03:00
Steve Klabnik
61cd377a64 Undo bad change in cf0931166be13dbbe660
I didn't know that this was about RDoc!
2013-03-19 13:04:02 -07:00
Prathamesh Sonpatki
cf0931166b Fixed small typos 2013-03-19 23:10:54 +05:30
schneems
334549b4a5 Fix improperly configured host in generated urls
If the host in `default_url_options` is accidentally set with a protocol such as 

```
host: "http://example.com"
``` 

then the generated url will have the protocol twice `http://http://example.com` which is not what the user intended. Likely they wanted to define a host `host: "example.com"` and a `protocol: "http://"` but did not know the convention.

This may not the most common problem, but when it happens it can go undetected for a while. I accidentally added `http://` out of habit recently only to find all the links in my emails were broken after deploying a demo site to production. Rather than allow this accident go undetected, we can fix the problem in line by properly setting the protocol and host.


I was able to find this related question on stack overflow: http://stackoverflow.com/questions/5878329/rails-3-devise-how-do-i-make-the-email-confirmation-links-use-secure-https-n where the answer was highly upvoted.

This is based off of work in #7415 cc/ @pixeltrix

ATP Action Mailer and Action Pack
2013-03-19 12:34:49 -05:00
Vipul A M
6893c23f48 drop an unused hash; change slang to SPECIAL 2013-03-19 11:00:01 +05:30
Brad Dunbar
95332abe09 Digest auth should not 500 when given a basic header. 2013-03-18 14:50:47 -04:00
Aaron Patterson
2392535f40 Merge branch 'master-sec'
* master-sec:
  fix protocol checking in sanitization [CVE-2013-1857]
  JDOM XXE Protection [CVE-2013-1856]
  fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
  stop calling to_sym when building arel nodes [CVE-2013-1854]
2013-03-18 10:17:32 -07:00
Carlos Antonio da Silva
eb32b3659d Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks
i18n locale fallback for localized views
2013-03-18 09:14:15 -07:00
Trevor Turk
7305ef842b The HTTP method helpers are preferred over match and should be explained before named routes 2013-03-18 06:35:19 -05:00
Trevor Turk
70ff81075d The default route has been removed 2013-03-18 06:22:08 -05:00
Trevor Turk
efea57a33b Using match without via is deprecated 2013-03-18 06:21:38 -05:00
Tatsuro Baba
396bb77199 Capitalize the first letter of sentence 2013-03-18 18:31:24 +09:00
Rafael Mendonça França
b365354e59 Merge pull request #9754 from macksmind/fix_actionpack_warnings
Fix rake test warnings in actionpack
2013-03-17 09:18:09 -07:00
Mack Earnhardt
c23f3aa7c0 Fix rake test warnings in actionpack 2013-03-17 12:16:42 -04:00
Grzegorz Derebecki
3ab7ddb8da Allow pass multipart option to form_for 2013-03-17 10:51:08 +01:00
Juan Barreneche
cecbf5dd4d Include I18n fallbacks in :locale lookup context 2013-03-16 21:27:13 -03:00
Bryan Ricker
fa63f83fd4 Remove :all from *args options in AbstractController.helper 2013-03-16 15:21:42 -07:00