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,044 Commits 34 Branches 105 Tags
563be40c59cba98b8bc162cf185ed7512e22b850
Commit Graph

27044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marten Veldthuis
563be40c59 Fix use of Deprecation without requiring active_support/deprecation in ActiveSupport::Concern in Base64 2012-01-31 13:41:08 +01:00
Marten Veldthuis
cb46423c53 Fix use of Deprecation without requiring active_support/deprecation in ActiveSupport::Concern 2012-01-31 13:40:11 +01:00
José Valim
175cdd11f4 Merge pull request #4786 from lest/patch-2 
fix assets test in 3-2-stable
 2012-01-31 03:35:21 -08:00
Sergey Nartimov
cfea673135 fix assets test 2012-01-31 14:27:40 +03:00
Jon Leighton
b2955edcea Allow writing unknown attributes, but with a deprecation warning. Closes #4583. 2012-01-31 08:50:36 +00:00
Jon Leighton
0bfc504d9c Add workaround and deprecation if the inherited hook is not executed. Closes #4757. 2012-01-31 08:41:51 +00:00
Jon Leighton
c472843bbc Merge pull request #4763 from kennyj/fix_4754 
[MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
 2012-01-31 08:23:25 +00:00
Xavier Noria
413790559c query cache instrumentation should included the bindings in the payload [closes #4750] 2012-01-30 13:48:05 -08:00
Vijay Dev
766e12aa7d fix typo [ci skip] 2012-01-30 23:45:55 +05:30
David Heinemeier Hansson
f78cb5583f Inline the prefix assignment so it doesnt look so daft 2012-01-27 20:43:49 +01:00
David Heinemeier Hansson
66b445c319 Revert "Fix expanding cache key for single element arrays" 
This reverts commit abe915f237.

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:41:37 +01:00
José Valim
2e5ec3b399 Merge check box fixes from remote-tracking branch 'cantonio/checkbox-hidden-backport' into 3-2-stable 2012-01-27 13:15:52 +01:00
Damien Mathieu
defb751681 don't set the hidden checkbox value if it's nil 2012-01-27 10:06:49 -02:00
Tadas Tamošauskas
19be5ea877 check_box helper with :disabled => true generates disabled hidden field. fixes #1953 2012-01-27 10:06:44 -02:00
Jon Leighton
1c5bd8a33d Merge pull request #4715 from pwim/find-create-multi-args 
Fix regression from Rails 3.1
 2012-01-27 09:31:48 +00:00
Xavier Noria
8e6ef371c5 fixes whitespace in CHANGELOG entries 2012-01-26 15:46:47 -08:00
Xavier Noria
67b8fbca92 updating RAILS_VERSION 2012-01-26 14:54:02 -08:00
Xavier Noria
97e8d1d819 CHANGELOG revision for v3.2.1 2012-01-26 14:28:48 -08:00
José Valim
c134f24f8f Revert usage of safe constantize 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-01-26 20:52:56 +01:00
Alex Tambellini
6c367a0d78 safe_constantize should handle wrong constant name NameErrors Fixes #4710 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-01-26 20:52:51 +01:00
Aaron Patterson
70cbb1c1cd bumping journey to 1.0.1 2012-01-26 10:24:15 -08:00
Aaron Patterson
5ac5acd63e Merge pull request #4696 from rafaelfranca/issue-4653 
Remove extra attributes from HABTM join tables in AR tests
 2012-01-26 09:41:04 -08:00
Aaron Patterson
7ba3ecca34 global variables may not be set depending on the match. fixes #4703 2012-01-26 09:24:45 -08:00
Rafael Mendonça França
06dcd9c0fb Remove extra attributes from HABTM join tables in AR tests 
HABTM Join tables should not have extra attributes

When extra attributes is needed in HABTM join tables is better to use
`has_many :through` association.

Fix #4653
 2012-01-26 10:32:10 -02:00
Xavier Noria
280937578b registers 2483460 in the CHANGELOG 2012-01-26 13:04:40 +01:00
Xavier Noria
24834606c2 disable automatic explain if there is no logger [closes #4671] 2012-01-26 02:51:18 -08:00
brainopia
3a087b8b5e Fix contributing guide to reflect preferred position on indentation 
Fix incorrect recommendation from indenting after private/protected to not.

Based on opinions of @spastorino, @jonleighton, @tenderlove

https://github.com/rails/rails/pull/1838#issuecomment-1440281
https://en.twitter.com/#!/spastorino/status/142054749351575552
https://en.twitter.com/#!/tenderlove/status/142014046445641728
https://en.twitter.com/#!/jonleighton/status/142021813415841794
 2012-01-26 10:58:22 +01:00
Sergey Nartimov
36d7af34d6 call to_s on value passed to table_name= 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-01-26 08:19:45 +01:00
Aaron Patterson
1a93eaae4e Merge pull request #4675 from lunks/3-2-stable 
Duping log handler on buffered logger silencer.
 2012-01-25 11:13:13 -08:00
Vijay Dev
b023921141 Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2 
Validation guides update 3 2
 2012-01-25 11:09:59 -08:00
Pedro Nascimento
c9cd0eb2d0 Duping log handler. fixes #4668 2012-01-25 16:53:51 -02:00
Carlos Antonio da Silva
2d73f70ac5 Fix callbacks order for destroying an object in validations guide 
Also add around save to creating/updating callbacks order, and fix save
example with no validation
 2012-01-25 16:36:28 -02:00
Carlos Antonio da Silva
79a0488cea Improve field error proc example in validations guide 2012-01-25 16:36:28 -02:00
Carlos Antonio da Silva
eb171fa328 Change ActiveRecord::Errors to ActiveModel::Errors in guides 
Use ActiveModel::Errors in inflection example docs as well.

Also fixes wrong information and link to locale file related to
Errors#full_messages in I18n guide.
 2012-01-25 16:36:27 -02:00
Carlos Antonio da Silva
6a85c45b1c Fix custom validation methods section in AR validations and callbacks guide 
The methods validate_on_create and validate_on_update are not available
anymore in Rails, this removes them from the guide and adds an example
on how to use validate with the :on option.
 2012-01-25 16:36:27 -02:00
Rohit Arondekar
a267090946 remove extra 'the' 2012-01-26 00:01:43 +05:30
Damian Le Nouaille
fd9d394cc3 example bracket error 2012-01-26 00:01:39 +05:30
Aaron Patterson
11e88a465c Merge pull request #4658 from pwim/unicode-paths 
Test for unicode path support
 2012-01-25 09:22:19 -08:00
Paul McMahon
22980e0c17 Test for unicode path support 
This is currently broken due to a bug in journey.
 2012-01-25 15:27:33 +09:00
José Valim
9e9e17a62e Merge pull request #4654 from pwim/explicit-deprecation-require 
Explicit deprecation require
 2012-01-24 19:52:45 -08:00
Paul McMahon
75d58fef26 allow requiring of 'active_model/naming' 
Requiring 'active_model/naming' will raise an uninitialized constant
ActiveSupport::Deprecation exception because the module core extension
doesn't require 'active_support/deprecation'. This require cannot be
added to the core extension because of circular dependency issues.
 2012-01-25 11:14:01 +09:00
Aaron Patterson
1d67f1ade7 Merge pull request #4639 from joevandyk/datetime-infinity-select-fix 
datetime_select fix for dates of -infinity and +infinity
 2012-01-24 15:06:27 -08:00
José Valim
dc81d0054b Merge pull request #4643 from rafaelfranca/3-2-stable 
Remove unused variables to avoid warnings
 2012-01-24 12:38:02 -08:00
Rafael Mendonça França
3cd28e24a1 Remove unused variables to avoid warnings 2012-01-24 18:06:41 -02:00
José Valim
5a66d33e28 Merge pull request #4641 from rafaelfranca/date_select-fix-3-2 
date_select fixes [3-2-stable]
 2012-01-24 11:35:11 -08:00
Aaron Patterson
e0fe62b926 Merge pull request #4514 from brainopia/update_timezone_offets 
Update time zone offset information
 2012-01-24 11:17:29 -08:00
Rafael Mendonça França
c4b7ca06a4 Fix date_select with discard_month and discard_year options 
Closes #4553 and #4633
 2012-01-24 16:38:08 -02:00
Joe Van Dyk
59a408eb64 datetime_select should work with -/+ infinity dates 2012-01-24 10:30:46 -08:00
Indrek Juhkam
d92b5fe07c Fix date_select nil and blank and order case 2012-01-24 16:03:16 -02:00
Indrek Juhkam
d4cfc4cec0 Add failing test for date_select 
date_select does not work when day is discarded, include blank option is
enabled and struct date itself is nil.
 2012-01-24 16:03:14 -02:00