Commit Graph

27984 Commits

Author SHA1 Message Date
kennyj
1a1d9e687a Fix GH #4754. Remove double-quote when using ANSI_QUOTES 2012-01-31 02:13:12 +09:00
Rahul P. Chaudhari
6831ab1110 Used block to make sure file get auto closed after use 2012-01-30 14:43:52 +05:30
José Valim
30327a00a0 Merge pull request #4745 from lest/patch-1
remove ruby 1.8 support code
2012-01-29 22:49:45 -08:00
Sergey Nartimov
44bd9719e9 remove ruby 1.8 support code 2012-01-29 23:03:28 +03:00
Santiago Pastorino
dfa0c36204 Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerables
Replaced all 'for' loops with Enumerable#each
2012-01-29 11:30:37 -08:00
Nathan Broadbent
bf928bc732 Use block form of 'File.open' so that File object is auto closed at end 2012-01-30 03:15:51 +08:00
Nathan Broadbent
b31eac5609 Replaced all 'for' loops with Enumerable#each 2012-01-30 03:15:49 +08:00
José Valim
677e06c20f Merge pull request #4743 from atd/patch-1
Add 'image/pjpeg' format used by IE
2012-01-29 08:57:37 -08:00
Antonio Tapiador
5dd80db4ea Add 'image/pjpeg' format used by IE
http://msdn.microsoft.com/en-us/library/ms775147%28v=vs.85%29.aspx#_replace
2012-01-29 17:36:10 +01:00
Santiago Pastorino
ec4440fd4e Merge pull request #4739 from nashby/refactor-date-helper
tiny refactoring of date_helper
2012-01-29 08:00:40 -08:00
Vasiliy Ermolovich
735c56d0cd tiny refactoring
use :default option with translate method instead of condition
simplify separator method
2012-01-29 18:26:38 +03:00
Santiago Pastorino
786a0195cb Merge pull request #4741 from pacoguzman/initialize_variable_not_needed
Remove initialize variable columnn, not needed
2012-01-29 07:24:39 -08:00
Paco Guzman
2a8f34ad8b Remove initialize variable columnn, not needed 2012-01-29 15:31:38 +01:00
José Valim
d5ddc6c1f7 Merge pull request #4740 from castlerock/remove_autoload_UrlWriter
remove autoload UrlWriter, no longer exists
2012-01-29 03:35:00 -08:00
Vishnu Atrai
95a935610c remove autoload UrlWriter, no longer exists 2012-01-29 17:00:37 +05:30
Santiago Pastorino
fd3211ef67 Merge pull request #4731 from ndbroadbent/revert_build_original_fullpath
Reverted build_original_fullpath method refactor
2012-01-27 17:15:46 -08:00
Nathan Broadbent
2d62334ae6 Reverted build_original_fullpath method, as per discussion at https://github.com/rails/rails/pull/4470/files#r393461 2012-01-28 09:12:18 +08:00
Santiago Pastorino
c0dafb615a Merge pull request #4730 from carlosantoniodasilva/patch-1
Remove not used env[] call in routing_test.
2012-01-27 17:02:13 -08:00
Carlos Antonio da Silva
b09aca6e3d Remove not used env[] call in routing_test.
The commit 4c321c6d42b6e35f9ead12eb1dccdead03c5abf4 removes the path_params variable assignment, actually the entire line is not used at all.
2012-01-27 19:48:53 -02:00
David Heinemeier Hansson
b495a8dba8 Inline the prefix assignment so it doesnt look so daft 2012-01-27 20:44:18 +01:00
David Heinemeier Hansson
83dbef6074 Revert "Fix expanding cache key for single element arrays"
This reverts commit abe915f23777efe10f17d611bf5718ca855a0704.

This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
2012-01-27 20:44:08 +01:00
Aaron Patterson
69816a830b Merge pull request #4726 from rafaelfranca/create_join_table
Add create_join_table migration helper to create HABTM join tables
2012-01-27 10:16:14 -08:00
Vijay Dev
a8da5d82fd fix a small typo [ci skip] 2012-01-27 23:32:58 +05:30
Rafael Mendonça França
080bd83df9 Add create_join_table migration helper to create HABTM join tables 2012-01-27 15:34:53 -02:00
Aaron Patterson
2fd9816851 Merge pull request #4709 from ask4prasath/refactor_validation_test
Removed unwanted intializer and replaced with ruby default collect method
2012-01-27 09:09:33 -08:00
Aaron Patterson
578c94ad02 Merge pull request #4722 from kennyj/fix_4708
Remove redundant instance variables (@colorize_logging)
2012-01-27 08:51:41 -08:00
Aaron Patterson
25d5c94baf Merge pull request #4724 from kennyj/fix_warning_20120128
Fix warning. assigned but unused variable - path_params
2012-01-27 08:46:36 -08:00
kennyj
4c321c6d42 Fix warning. assigned but unused variable - path_params 2012-01-28 01:16:32 +09:00
José Valim
0341ca15af Merge pull request #4721 from ab9/fix_has_secure_password_doc
Fix documentation for has_secure_password
2012-01-27 06:16:06 -08:00
kennyj
2e7d6ff08d Remove redundant instance_variables (@colorize_logging) 2012-01-27 23:01:14 +09:00
Aaron Beckerman
9d119c5fee fix example code in documentation for has_secure_password 2012-01-28 00:53:02 +11:00
Jon Leighton
f22a0e2f1d Merge pull request #4715 from pwim/find-create-multi-args
Fix regression from Rails 3.1
2012-01-27 01:28:54 -08:00
Jeremy Kemper
faaf694e0f Disagree with @spastorino, @jonleighton, @tenderlove on 51ccb7f59c83120bf6869f1febfebaec44bcface
Same-level method visibility disappears into the syntax. Indent (and
outdent) emphasize the state change that accompanies the declaration.
All methods following 'private' are private: that's a natural
hierarchy worthy of visual reinforcement.

Outdent, represent!  :trollface:
2012-01-26 20:34:04 -07:00
Paul McMahon
7b9baeed7c Fix regression from Rails 3.1
Under Rails 3.1, you were allowed to pass a hash to a find_or_create
method with multiple attribute names, but this was broken as the
arguments were being improperly validated.
2012-01-27 09:37:14 +09:00
Piotr Sarnacki
f1baf8f5a4 Merge pull request #4713 from carlosantoniodasilva/form-label-for
Do not generate label for attribute when giving nil
2012-01-26 16:12:20 -08:00
Carlos Antonio da Silva
b03e55d177 Do not generate label for attribute when giving nil 2012-01-26 21:23:33 -02:00
José Valim
e634efca99 Revert usage of safe constantize 2012-01-26 20:48:09 +01:00
José Valim
5dab9bd2cd Merge pull request #4711 from atambo/master
3.2 safe_constantize should handle wrong constant name NameErrors Fixes #4710
2012-01-26 11:41:58 -08:00
Alex Tambellini
7598284c0b safe_constantize should handle wrong constant name NameErrors Fixes #4710 2012-01-26 14:19:49 -05:00
prasath
f4d9ba0296 Removed unwanted intializer and replaced with ruby default collect method 2012-01-27 00:13:46 +05:30
Aaron Patterson
82ba5c469f bumping journey to 1.0.1 2012-01-26 10:23:36 -08:00
Aaron Patterson
33fda1ca56 Merge pull request #4696 from rafaelfranca/issue-4653
Remove extra attributes from HABTM join tables in AR tests
2012-01-26 09:41:43 -08:00
Aaron Patterson
ef7fc6ebb3 global variables may not be set depending on the match. fixes #4703 2012-01-26 09:24:14 -08:00
Vijay Dev
ad1b2aa4ed Merge pull request #4699 from mattdbridges/typo_fix
Fixed small typo in ActveRecord/CHANGELOG.md
2012-01-26 08:32:07 -08:00
Matt Bridges
abb1423a8d Fixed small typo in ActveRecord/CHANGELOG.md 2012-01-26 08:51:41 -06:00
Xavier Noria
9725c0cb34 syncs 3-2-stable CHANGELOGs in master 2012-01-26 13:12:04 +01:00
José Valim
8fab39527f Revert "Merge pull request #4690 from jdutil/filter_password_confirmation"
This reverts commit eafa1c429835e099897a0da90bc39d9dbbb7ed4e, reversing
changes made to f251437415f7b803f7a84118fcc970a111ace266.
2012-01-26 12:12:54 +01:00
José Valim
eafa1c4298 Merge pull request #4690 from jdutil/filter_password_confirmation
Add :password_confirmation as a filtered param by default.
2012-01-26 02:56:29 -08:00
Xavier Noria
f251437415 disable automatic explain if there is no logger [closes #4671] 2012-01-26 02:50:46 -08:00
Jeff Dutil
521fedc043 Add :password_confirmation as a filtered param by default. 2012-01-26 05:37:23 -05:00