aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes.Francesco Rodriguez2012-10-283-3/+38
|/ /
* | Merge pull request #8052 from schneems/schneems/silence-ar-query-in-middlewareRafael Mendonça França2012-10-281-1/+3
|\ \
| * | Don't log on pending migration check schneems2012-10-281-1/+3
|/ /
* | Add syntax highlight to code blocks in javascript guide [ci skip]Carlos Antonio da Silva2012-10-281-27/+25
* | Add backticks around link_to example in javascript guide [ci skip]Carlos Antonio da Silva2012-10-282-1/+3
* | Merge pull request #8050 from bashmish/masterCarlos Antonio da Silva2012-10-281-0/+1
|\ \ | |/ |/|
| * fix typo in button_to helper exampleMichael Bashkirov2012-10-281-0/+1
|/
* USe the released version of sprockets-rails in a new Rails 4 applicationRafael Mendonça França2012-10-271-1/+1
* Merge pull request #7960 from pwnall/mysql_varbinaryRafael Mendonça França2012-10-277-18/+71
|\
| * Use the MySQL varbinary type when appropriate in migrations.Victor Costan2012-10-277-18/+71
* | Improve the deprecation message of link_to_function andRafael Mendonça França2012-10-272-8/+10
|/
* Merge pull request #8034 from gbchaosmaster/readme-formatXavier Noria2012-10-272-19/+18
|\
| * Organize READMEVinny Diehl2012-10-262-19/+18
* | Add the Working with JavaScript Guides in the guides home as WIPRafael Mendonça França2012-10-271-29/+34
* | Merge pull request #8043 from senny/remove_trailing_whitespace_in_actionpackRafael Mendonça França2012-10-2711-17/+17
|\ \
| * | cleanup, remove trailing whitespace within actionpackYves Senn2012-10-2711-17/+17
|/ /
* | Merge pull request #8040 from frodsan/fix_build_isolatedJeremy Kemper2012-10-261-0/+1
|\ \
| * | fix failing isolated testsFrancesco Rodriguez2012-10-261-0/+1
|/ /
* | Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependencyJeremy Kemper2012-10-265-6/+6
|\ \
| * | fix AM::Serializers titles [ci skip]Francesco Rodriguez2012-10-262-2/+2
| * | AM::Serializers::Xml depends on AM::NamingFrancesco Rodriguez2012-10-264-4/+4
|/ /
* | Fix queueing tests that should be consuming the queue rather than draining itJeremy Kemper2012-10-262-4/+10
* | Job consumer logs to Rails.logger by defaultJeremy Kemper2012-10-263-2/+7
* | Job worker thread logs failed jobs tooJeremy Kemper2012-10-262-2/+2
* | Job worker thread logs to stderr if no logger is providedJeremy Kemper2012-10-262-2/+13
* | Merge pull request #7593 from veader/patch-1Rafael Mendonça França2012-10-263-1/+15
|\ \
| * | Decode attributes pulled from URI.parseShawn Veader2012-10-263-1/+15