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
27,281 Commits 34 Branches 105 Tags
45d6cd94b3ef2ec77166def41f29188445b35608
Commit Graph

27281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santiago Pastorino
45d6cd94b3 Bump up to 3.2.3 2012-03-30 19:22:28 -03:00
Santiago Pastorino
5c7bb86a1b Remove the leading \n added by textarea on assert_select 2012-03-30 11:45:12 -03:00
Santiago Pastorino
5284e650be Bumping to 3.2.3.rc2 2012-03-29 13:12:44 -03:00
Santiago Pastorino
b395ca1fda Add missing CHANGELOG entry 2012-03-29 11:19:26 -03:00
Santiago Pastorino
dd69076eb8 Add missing CHANGELOG entry 2012-03-29 10:55:47 -03:00
Vijay Dev
921c404268 fix incorrect url in the deprecation message for vendor/plugins [ci skip] 2012-03-29 09:22:04 -03:00
Santiago Pastorino
87825a6ab5 Set proper rendered_format when doing render :inline 
Closes #5632
 2012-03-28 18:55:14 -03:00
Piotr Sarnacki
db2c1354eb Cover one more case in auth_token and remote forms 
If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.
 2012-03-28 18:10:44 +02:00
Santiago Pastorino
84ca8c8cd0 Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms 
Embed auth token in remote forms
 2012-03-28 10:58:57 -03:00
Santiago Pastorino
4f66586bbf Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml 
Textarea newline fix breaks haml (3-2-stable)
 2012-03-27 18:17:26 -03:00
Santiago Pastorino
5f37260918 Bumping to 3.2.3.rc1 2012-03-27 14:07:36 -03:00
José Valim
e31ec4700b Merge pull request #5603 from drogus/fix-rendered-format-for-render-partial 
Fix rendered format for render partial
 2012-03-27 00:38:31 -07:00
Piotr Sarnacki
449a4fc095 If partial is rendered in controller, grab format from template 
Previously `rendered_format` was set only based on mime types
passed in Accept header, which was wrong if first type from
Accept was different than rendered partial. The fix is to simply
move setting rendered_format to the place where template
is available and grab format from the template. If it fails
we can fallback to formats passed by Accept header.
 2012-03-27 05:33:47 +02:00
Aaron Patterson
3eb5be67b1 Merge pull request #2621 from icco/master 
Issue with schema dump
 2012-03-26 17:26:10 -07:00
José Valim
0e916ae232 Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2 
Fix build for branch 3-2-stable - return the same session hash object
 2012-03-26 14:11:55 -07:00
Piotr Sarnacki
3f1b8c6a95 Merge pull request #5596 from lest/patch-3 
apply form_for namespace option to date_select
 2012-03-26 13:18:35 -07:00
Sergey Nartimov
bd8a9701c2 apply form_for namespace option to date_select 2012-03-26 21:53:10 +03:00
Abe Voelker
ed7567ca7a Fix 'Security#Mass Assignment' URL typo 2012-03-26 21:39:29 +05:30
Carlos Antonio da Silva
907bcce9a0 Return the same session data object when setting session id 
Make sure to return the same hash object instead of returning a new one.
Returning a new one causes failures on cookie store tests, where it
tests for the 'Set-Cookie' header with the session signature.

This is due to the hash ordering changes on Ruby 1.8.7-p358.
 2012-03-24 11:20:43 -03:00
Aaron Patterson
eb0d8ee4fd chdir before globbing so that we don't need to escape directory names. 
fixes #5521
 2012-03-23 11:50:00 -07:00
Aaron Patterson
0382e44080 Merge pull request #5537 from kennyj/fix_4399-32 
[3-2-stable] migrate(:down) method with table_name_prefix
 2012-03-23 10:50:16 -07:00
Piotr Sarnacki
ef48cea169 Merge pull request #5558 from carlosantoniodasilva/fix-build-3-2 
Fix build for branch 3-2-stable - Part 2
 2012-03-23 06:42:48 -07:00
Carlos Antonio da Silva
0879ebdf36 Fix identity map tests 2012-03-23 02:21:49 -03:00
Aaron Patterson
ea4e021dce Merge pull request #5557 from carlosantoniodasilva/fix-build-3-2 
Fix build for branch 3-2-stable
 2012-03-22 21:04:32 -07:00
Carlos Antonio da Silva
b332891b2a Add order to tests that rely on db ordering, to fix failing tests on pg 
Also skip persistente tests related to UPDATE + ORDER BY for postgresql

PostgreSQL does not support updates with order by, and these tests are
failing randomly depending on the fixture loading order now.
 2012-03-22 22:41:10 -03:00
José Valim
b714140f4d Merge pull request #5525 from kennyj/fix_5411 
Fix GH #5411. When precompiling, params method is undefined.
 2012-03-22 01:40:54 -07:00
kennyj
8c262f7591 Fix GH #5411. When precompiling, params method is undefined. 2012-03-22 13:25:37 +09:00
Piotr Sarnacki
89f88669bf Merge pull request #5542 from mhfs/port_5522_to_32stable 
Port of #5522 'Fix adding/removing field's index when generating migration'
 2012-03-21 18:23:19 -07:00
Marcelo Silveira
35bf748cd2 [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating migration' 2012-03-21 19:43:41 -03:00
José Valim
f829515ad9 Merge pull request #5533 from mhfs/migration_blank_line_3_2 
[3-2-stable] Remove blank line from generated migration
 2012-03-21 00:28:38 -07:00
kennyj
565bfb9cd4 migrate(:down) method with table_name_prefix 2012-03-21 15:53:27 +09:00
Marcelo Silveira
57c6b4c0fe [3-2-stable] Remove blank line from generated migration 2012-03-20 22:07:09 -03:00
David Heinemeier Hansson
275ee0dc7b We dont need to merge in the parameters as thats all being reset by the rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing) 2012-03-20 22:16:44 +01:00
José Valim
358333f888 Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stable 
Build fix 1.8.7 3 2 stable
 2012-03-18 23:50:51 -07:00
Arun Agrawal
fcc8743459 Build fix for ruby1.8.7-358 2012-03-19 11:58:55 +05:30
Mikel Lindsaar
74b782999f Increase minimum version of mail. 
Second security vulnerability found in mail file delivery method
  patched in version 2.4.4.
 2012-03-19 14:43:07 +11:00
José Valim
c8fbd48a26 Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-2-stable 
Build fix app generator test 3 2 stable
 2012-03-18 09:27:21 -07:00
Arun Agrawal
9451201a3b Build fix for app_generator_test.rb 2012-03-18 21:27:23 +05:30
Piotr Sarnacki
d9355bea04 Merge pull request #5493 from kennyj/fix_5435-32 
[3-2-stable] Fix GH #5435. db:structure:dump should be re-enable.
 2012-03-18 02:33:33 -07:00
kennyj
f4f9ec1536 Fix GH #5435. db:structure:dump should be re-enable. 2012-03-18 14:19:30 +09:00
Piotr Sarnacki
41815f5d6c Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only 2012-03-17 23:30:28 +01:00
José Valim
c0a5b8505d Ensure load hooks can be called more than once with different contexts. 2012-03-17 17:21:02 -03:00
José Valim
e5b46cfb6d Merge pull request #5480 from drogus/rendering-issues 
Fix for #5440
 2012-03-17 07:08:49 -07:00
Piotr Sarnacki
7130f91591 Add missing test for #5308 2012-03-17 14:15:55 +01:00
Piotr Sarnacki
1eb6189404 Fix #5440 - multiple render_to_string breaks partials formats 
This fixes situation where rendering template to string
sets `rendered_format` to the format rendered there.
This is ok to have consistent formats rendered in partials,
but it breaks on next renders if format is explicitly set
or on last render where default format does not necessarily
need to be the format of first rendered template.
 2012-03-17 14:15:50 +01:00
Aaron Patterson
e135ff1afd Merge pull request #5457 from brianmario/typo-fix 
Fix typo in redirect test
 2012-03-15 15:22:46 -07:00
Aaron Patterson
f52ad6cf33 Merge pull request #5456 from brianmario/redirect-sanitization 
Strip null bytes from Location header
 2012-03-15 14:58:27 -07:00
Aaron Patterson
bd3e1ed23c Merge pull request #5437 from kennyj/fix_5430 
Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
 2012-03-15 11:12:08 -07:00
Aaron Patterson
f918137792 Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence 
3 2 static invalid byte sequence
 2012-03-15 10:14:13 -07:00
Piotr Sarnacki
9dfb41fd2e Check for existence of exactly the called fixture_path= method 2012-03-15 04:37:13 +01:00