AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,542 Commits 34 Branches 105 Tags
3-2-github
Commit Graph

8420 Commits

Author SHA1 Message Date
Aaron Patterson
5ede19b772 bumping to rc2 2013-10-04 13:46:35 -07:00
Aaron Patterson
5e277c8208 bumping version to 3.2.15.rc1 2013-10-03 11:52:44 -07:00
Aaron Patterson
befeeb2d0a Merge branch '3-2-stable' into 3-2-sec 
* 3-2-stable:
  make sure both headers are set before checking for ip spoofing
  Move set_inverse_instance to association.build_record
 2013-10-03 10:27:58 -07:00
Tamir Duberstein
85106decc4 make sure both headers are set before checking for ip spoofing 2013-10-01 01:26:07 -07:00
Michael Koziarski
5aee516b5e Remove the use of String#% when formatting durations in log messages 
This avoids potential format string vulnerabilities where user-provided
data is interpolated into the log message before String#% is called.
 2013-09-30 14:42:11 -07:00
Eugene Kalenkovich
c9642e31b1 Fix FinderMethods#last unscoped primary key 
Fixes table.joins(:relation).last(N) breaking on sqlite

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/finder_test.rb
 2013-09-12 14:08:02 -03:00
Brian Hahn
03ac291526 pass the extra params to the rack test environment so that routes with block constraints have access 2013-09-06 11:08:41 -07:00
Kassio Borges
424a5a7d46 fix issue #11605 2013-08-24 15:24:36 -03:00
Rafael Mendonça França
e0db277be0 Fix actionpack CHANGELOG entry 
It was included by git on the wrong release
 2013-07-22 20:25:20 -03:00
Rafael Mendonça França
2b3ce8627b Merge branch '3-2-14' into 3-2-stable 2013-07-22 20:24:09 -03:00
Rafael Mendonça França
2fcd13eff2 Preparing for 3.2.14 release 2013-07-22 12:05:41 -03:00
Rafael Mendonça França
47fb44fc7a Update CHANGELOG entry 2013-07-22 11:57:02 -03:00
Alexey Chernenkov
0f5ba6e124 Fix assert_redirected_to does not show user-supplied message. 
Issue: when `assert_redirected_to` fails due to the response redirect not
matching the expected redirect the user-supplied message (second parameter)
is not shown. This message is only shown if the response is not a redirect.
 2013-07-18 10:54:36 +06:00
Arun Agrawal
fc0faaa590 Removed unused test file 
This test file is not be running from a long time
This test is already covered in controller/caching_test.rb
 2013-07-17 11:47:24 +02:00
Rafael Mendonça França
a96df04aac Preparing for 3.2.14.rc2 release 2013-07-16 13:00:33 -03:00
Rafael Mendonça França
facfc24f25 Preparing for 3.2.14.rc1 release 2013-07-12 21:06:50 -03:00
Rafael Mendonça França
2ce875dfbd Add license to the gemspec 2013-07-08 14:51:19 -03:00
Santiago Pastorino
e359e3ab93 Add missing require 2013-07-02 17:00:33 -07:00
Andrew White
b0c65978ab Use old style hash syntax for 3-2-stable 2013-06-25 12:24:06 +01:00
Andrew White
622e4ab424 Fix shorthand routes where controller and action are in the scope 
Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
shorthand syntax (i.e. endpoint is inferred from the the path).

Fixes #9856

Backport of 37b4276
 2013-06-25 11:00:19 +01:00
Rafael Mendonça França
ca23e6d4d3 Add CHANGELOG entry for #10971 
[ci skip]
 2013-06-24 16:19:38 -03:00
Rafael Mendonça França
2553bd785c Merge pull request #10971 from dtaniwaki/escape_link_to_unless 
Always escape the result of link_to_unless method
 2013-06-24 16:15:56 -03:00
Rafael Mendonça França
9f754e801f Compare host scheme using case-insensitive regexp 
Before:

    image_tag("HTTP://google.com")
    # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />"
    image_tag("http://google.com")
    # => "<img alt=\"Google\" src=\"http://google.com\" />"

After:

    image_tag("HTTP://google.com")
    # => "<img alt=\"Google\" src=\"HTTP://google.com\" />"
    image_tag("http://google.com")
    # => "<img alt=\"Google\" src=\"http://google.com\" />"

Backport of #10969
 2013-06-16 22:05:26 -03:00
Rafael Mendonça França
0be27b709b So not make Fixnum#/ private on Ruby verions less than 1.9.3 
In those version to_date call Fixnum#/, what will cause a failure
 2013-05-10 14:10:10 -03:00
Rafael Mendonça França
0b35a3aacc Merge pull request #10478 from cainlevy/patch-1 
use canonical #controller_path logic in controller test cases
Conflicts:
	actionpack/lib/action_controller/test_case.rb
 2013-05-06 22:19:46 -03:00
Ben Tucker
5a6d9d5491 Merging in fix from #8222 2013-05-06 09:36:40 -04:00
Aaron Patterson
ba12ef6ae1 just clear the caches on clear! rather than replacing. fixes #10251 2013-04-17 11:36:08 -07:00
Rafael Mendonça França
c9bd2022d4 Improve the changelog entry [ci skip] 2013-04-05 16:54:01 -03:00
Ryan McGeary
44a9aedd7b Fix explicit names on multiple file fields 
If a file field tag is passed the multiple option, it is turned into an
array field (appending "[]"), but if the file field is passed an
explicit name as an option, leave the name alone (do not append "[]").

Fixes #9830
 2013-04-05 15:35:20 -04:00
Carlos Antonio da Silva
fe58853765 Fix typo in view name 
Introduced in 2c22376fe0
 2013-04-03 20:59:44 -03:00
Carlos Antonio da Silva
e252e0ffe1 Use 1.8 hash style in test views 
Introduced in 2c22376fe0
 2013-04-03 20:59:40 -03:00
Dmitry Vorotilin
2c22376fe0 Common behavior with adding formats to lookup_context for TemplateRenderer and PartialRenderer 2013-04-02 10:36:23 -07:00
Carlos Antonio da Silva
060fca7897 Fix formatting and minor review in AP changelog 
Sentences starting with # are considered headings.
 2013-03-30 16:42:52 -03:00
Fred Wu
dee5915aac Fixed test failures on 1.8.7 caused by 74e59ea 2013-03-27 11:29:37 +11:00
Mack Earnhardt
74e59ea8b6 Backport #5808 
df36c5f - Fix assert_template assertion with :layout option
4bd05a7 - Fix assert_template :layout => nil assertion
0d19a08 - Improve assert_template layout checking
 2013-03-24 08:16:26 -04:00
Rafael Mendonça França
69599b63de Fix test to Ruby 1.8 
Pathname doesn't respond to to_path
 2013-03-21 09:33:22 -03:00
Rafael Mendonça França
afe5880fa6 Improve CHANGELOG entry [ci skip] 2013-03-21 09:16:48 -03:00
Aaron Patterson
d1577cfe3d Merge branch '3-2-stable' into fredwu-slow_view_loading_fix 
* 3-2-stable:
  Merge pull request #9802 from newsline/fix-broken-action-missing
  Remove bad changelog entry from AR [ci skip]
  Wrong exception is occured when raising no translatable exception
  Don't crash exception translation w/ nil result attribute.

Conflicts:
	actionpack/CHANGELOG.md
 2013-03-20 16:41:01 -07:00
Fred Wu
38d0647861 Added changelog for 687e68d 2013-03-21 09:26:07 +11:00
Rafael Mendonça França
2c8f349953 Merge pull request #9802 from newsline/fix-broken-action-missing 
Fix missing action_missing

Conflicts:
	actionpack/CHANGELOG.md

Conflicts:
	actionpack/test/controller/base_test.rb

Fixes #9799
 2013-03-20 18:22:31 -03:00
Fred Wu
687e68d88f Fixed assets loading performance in 3.2.13 
The PR #8756 uses Sprockets for resolving files that already exists on disk, for those files their extensions don't need to be rewritten.

Fixes #9803
 2013-03-20 16:13:30 +11:00
hoffm
1b12d08a0f Backport #9347 to rails 3.2 2013-03-19 09:30:50 -05:00
claudiob
0e56c1de70 Add release dates to documentation [ci skip] 
Set "March 18, 2013" as the release date for 3.2.13
 2013-03-18 14:51:46 -07:00
Carlos Antonio da Silva
a8e7a009d2 Fix changelog conflicts and remove release dates [ci skip] 2013-03-18 18:18:55 -03:00
Aaron Patterson
afcd01bf25 Merge branch '3-2-13' into 3-2-stable 
* 3-2-13:
  bumping to 3.2.13
  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]
  Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets
  bumping to rc2
  Revert "Merge pull request #8209 from senny/backport_8176"
  Freeze columns only once per Result
  Preparing for 3.2.13.rc1 release
  Update CHANGELOGs for 3.2.13 release.

Conflicts:
	actionmailer/CHANGELOG.md
	actionpack/CHANGELOG.md
	activemodel/CHANGELOG.md
	activeresource/CHANGELOG.md
	activesupport/CHANGELOG.md
	railties/CHANGELOG.md
 2013-03-18 10:17:04 -07:00
Aaron Patterson
a4b5582772 bumping to 3.2.13 2013-03-18 09:23:04 -07:00
Yves Senn
f662a748a5 do not freeze NumberHelper defaults. 
Closes #9767.
 2013-03-18 16:51:35 +01:00
Aaron Patterson
99123ad12f fix protocol checking in sanitization [CVE-2013-1857] 
Conflicts:
	actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
 2013-03-15 17:48:42 -07:00
Charlie Somerville
ff3b9ca130 fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] 2013-03-15 17:48:12 -07:00
Juan Barreneche
ce755697fc Extract hardcoded lists to Redo::RestaurantsList 2013-03-14 18:02:20 -03:00