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
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
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
Xavier Noria
d11347df72
Merge pull request #4689 from claudiob/add_rails32_release_date
...
Add release date of Rails 3.2.0 to documentation
2012-01-26 02:00:24 -08:00
claudiob
6d426b1035
Add release date of Rails 3.2.0 to documentation
2012-01-26 01:53:38 -08:00
José Valim
c00d77fe8b
Merge pull request #4687 from lest/patch-2
...
fix fixtures test as table_name is a string now
2012-01-26 00:37:57 -08:00
Sergey Nartimov
6e46b3bc27
fix fixtures test as table_name is a string now
2012-01-26 11:10:52 +03:00
Xavier Noria
c6efa0d1c7
Merge pull request #4684 from rossmeissl/patch-1
...
Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit URL
2012-01-25 23:53:06 -08:00
Xavier Noria
70b059835b
Merge pull request #4685 from brainopia/fix_contribute_guide
...
Fix contributing guide to reflect preferred position on indentation
2012-01-25 23:50:52 -08:00
José Valim
6a7d3780df
Merge pull request #4686 from lest/patch-2
...
call to_s on value passed to table_name=
2012-01-25 23:19:13 -08:00
Sergey Nartimov
db48ee3847
call to_s on value passed to table_name=
2012-01-26 10:12:12 +03:00
José Valim
ba5a334acd
Use content_tag_for with array by default on scaffold.
2012-01-26 08:07:38 +01:00
José Valim
345ac29374
Merge pull request #4679 from lest/patch-1
...
AssetTagHelper improvements
2012-01-25 22:39:26 -08:00
brainopia
51ccb7f59c
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:04:57 +04:00
Andy Rossmeissl
1873adf6e4
Use :rubygems
shortcut as standard Gemfile's source
instead of explicit URL.
...
Theoretically this would future-proof Gemfiles against possible (albeit unlikely) change in the rubygems URL.
2012-01-25 23:36:06 -05:00
Aaron Patterson
522c0fdb55
The primary key is always initialized in the @attributes hash to nil (unless
...
another value has been specified).
2012-01-25 14:42:22 -08:00
Sergey Nartimov
858f4646fe
reuse common video/audio tags code and do not modify options
2012-01-26 01:13:20 +03:00
Sergey Nartimov
fc5478799b
do not modify options in image_tag
2012-01-26 01:13:20 +03:00
José Valim
0920065772
Merge pull request #4676 from lest/patch-1
...
allow to pass multiple sources to audio/video tags without using array
2012-01-25 11:28:22 -08:00
Sergey Nartimov
08e5104a59
allow to pass multiple sources to audio/video tags without using array
2012-01-25 22:22:39 +03:00
Vijay Dev
73c53cd9eb
Merge pull request #4529 from ask4prasath/refactor
...
Refactored class methods on address render test
2012-01-25 11:18:48 -08:00
Aaron Patterson
e2edfe188c
Merge pull request #4645 from brainopia/deprecate_datetime_local_offset
...
Deprecate DateTime.local_offset
2012-01-25 11:07:22 -08:00
brainopia
b258bec431
Deprecate DateTime.local_offset
2012-01-25 23:04:40 +04:00
Vijay Dev
203771da9e
Merge branch 'master' of github.com:lifo/docrails
2012-01-26 00:00:40 +05:30
Vijay Dev
368f0fe2d3
Revert "Added Apache configuration for dynamic gzip content"
...
This reverts commit fce92fd8a7e407b034d189a652af81a06ac98730.
Reason: We want any config that goes into the guides to be 100% right
and I'm not entirely sure that this one is it. We already had a similar
config that was removed in
b1c20e37ec
2012-01-25 23:57:44 +05:30
Vijay Dev
b32ebf0461
minor text change [ci skip]
2012-01-25 23:57:33 +05:30
Aaron Patterson
c421870c7a
Merge pull request #4644 from ask4prasath/refactor_test
...
Replaced unwanted method and added to accessor for getter history
2012-01-25 09:40:45 -08:00
Aaron Patterson
eee5a6cfa0
Merge pull request #4646 from lest/patch-1
...
no need in separate MiniTest modules
2012-01-25 09:31:29 -08:00