aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make sure that RAILS_ENV is set when accessing Rails.envSteve Klabnik2012-10-312-1/+6
* Revert "Don't allocate new strings in compiled attribute methods"David Heinemeier Hansson2012-10-312-39/+20
* No need for the debuggerDavid Heinemeier Hansson2012-10-311-1/+0
* Allow #permit to take its list of permitted parameters as an arrayDavid Heinemeier Hansson2012-10-312-1/+6
* Revert "if format is unknown NullMimeTypeObject is returned"Guillermo Iguaran2012-10-313-28/+2
* Remove extre count, preheat already happens during setupCarlos Antonio da Silva2012-10-311-1/+0
* Merge pull request #8073 from alexisbernard/fix_find_in_batches_start_optionCarlos Antonio da Silva2012-10-313-2/+15
|\
| * Fix find_in_batches against string IDs when start option is not specified.Alexis Bernard2012-10-313-2/+15
|/
* Merge pull request #8084 from acapilleri/format_never_nilRafael Mendonça França2012-10-313-2/+28
|\
| * if format is unknown NullMimeTypeObject is returnedAngelo capilleri2012-10-313-2/+28
|/
* Merge pull request #8078 from nikitug/serialized_attributes_before_type_castCarlos Antonio da Silva2012-10-313-3/+27
|\
| * Fix `attributes_before_type_cast` for serialised attributes.Nikita Afanasenko2012-10-313-3/+27
|/
* Merge pull request #8074 from kennyj/fix_6951Rafael Mendonça França2012-10-303-6/+22
|\
| * Fix #6951. Use query cache/uncache, when using not only database.yml but also...kennyj2012-10-313-6/+22
|/
* Revert "Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.foo(*arg...Jon Leighton2012-10-303-15/+0
* Revert "The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now."Santiago Pastorino2012-10-301-1/+1
* Merge pull request #8072 from kennyj/remove_mattr_include_root_in_jsonCarlos Antonio da Silva2012-10-302-1/+16
|\
| * include_root_in_json allows inheritance.kennyj2012-10-312-1/+16
* | Merge pull request #6107 from gazay/make_caller_attribute_in_deprecation_opti...Carlos Antonio da Silva2012-10-3037-56/+59
|\|
| * Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-3037-56/+59
|/
* Remove not assigned variable warning from sqlite3 adapter testCarlos Antonio da Silva2012-10-291-1/+1
* Fix bug when Column is trying to type cast boolean values to integer.Rafael Mendonça França2012-10-292-6/+17
* Merge pull request #8066 from cfabianski/AddTestForSerializationMethodCarlos Antonio da Silva2012-10-291-0/+9
|\
| * Add test for code change introduced in this commit f20032fCédric FABIANSKI2012-10-291-0/+9
|/
* Fix failing tests and use new hash style in deprecation messagesCarlos Antonio da Silva2012-10-296-28/+28
* Merge pull request #8063 from nikitug/deprecation_caller_contextCarlos Antonio da Silva2012-10-2927-55/+88
|\
| * Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-2927-55/+88
* | Fix deprecation message in test for Path#childrenCarlos Antonio da Silva2012-10-291-1/+1
|/
* Add test to deprecation of Path#childrenRafael Mendonça França2012-10-291-0/+6
* Merge pull request #7587 from elia/fix-too-eager-loadingRafael Mendonça França2012-10-293-6/+17
* Merge pull request #8027 from daenney/masterXavier Noria2012-10-293-3/+12
|\
| * atomicc.rb: Don't assume we may chown/chmod a file.Daniele Sluijters2012-10-293-3/+12
|/
* Fix the skip code.Rafael Mendonça França2012-10-281-4/+4
* Merge pull request #8057 from frodsan/fix_sqlite_mutate_argRafael Mendonça França2012-10-282-1/+7
|\
| * SQLite3Adapter#type_cast should not mutate argumentsStefan Rusterholz2012-10-282-1/+7
|/
* Merge pull request #7750 from xuanxu/none_modificating_relation_in_placeRafael Mendonça França2012-10-284-0/+25
|\
| * ActiveRecord::Relation#none! method.Juanjo Bazán2012-10-283-0/+16
| * loaded relations cannot be mutated by extending!Juanjo Bazán2012-10-281-0/+9
|/
* Merge pull request #8053 from henrik/update_columns_with_primary_keyCarlos Antonio da Silva2012-10-283-1/+20
|\
| * Enable update_column(s) for the primary key attribute.Henrik N2012-10-283-1/+20
|/
* Merge pull request #8046 from pmahoney/exceptions_as_flow_controlRafael Mendonça França2012-10-281-2/+2
|\
| * Replace flow-control exception with explicit test.Patrick Mahoney2012-10-271-2/+2
* | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_callRafael Mendonça França2012-10-285-1/+28
|\ \
| * | Do not render views when mail() isn't called. (NullMail refactoring)Yves Senn2012-10-285-1/+28
| |/
* | Merge pull request #8047 from arunagw/json_only_in_18Carlos Antonio da Silva2012-10-281-1/+0
* | Fix some assert_raise calls containing messages in Active SupportCarlos Antonio da Silva2012-10-282-7/+15
* | Merge pull request #8054 from senny/6378_create_table_raises_when_defining_pk...Carlos Antonio da Silva2012-10-285-6/+45
|\ \
| * | raise `ArgumentError` when redefining the primary key column. Closes #6378Yves Senn2012-10-283-0/+34
| * | refactor `SQLite3Adapter#copy_table` to prevent primary key redefinitions. #6378Yves Senn2012-10-282-6/+11
|/ /
* | Merge pull request #8056 from frodsan/fix_issue_missing_attributeRafael Mendonça França2012-10-283-3/+38
|\ \