aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
* | | | | Merge pull request #7971 from dgraham/hash-replaceRafael Mendonça França2012-10-263-0/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Implement replace method so key? works correctly.David Graham2012-10-263-0/+22
|/ / / /
* | | | remove unused config optionJon Leighton2012-10-261-3/+0
* | | | Remove ActiveRecord::Model entry from 4.0 Release Notes [ci skip]Carlos Antonio da Silva2012-10-261-8/+0
* | | | Remove ActiveRecord::Model consant from AS::TestCaseCarlos Antonio da Silva2012-10-261-1/+1
* | | | Remove REE GC stats since master is 1.9.3Jeremy Kemper2012-10-261-17/+5
* | | | Remove ActiveRecord::ModelJon Leighton2012-10-2640-642/+232
* | | | Add missing require for minitest assertions. Breaks calling 'app' in console ...Jeremy Kemper2012-10-251-0/+1
* | | | Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2Carlos Antonio da Silva2012-10-251-2/+2
|\ \ \ \
| * | | | Update redcarpet dependencyVinny Diehl2012-10-251-2/+2
| |/ / /
* | | | Merge pull request #8030 from calebthompson/fix-ternaryRafael Mendonça França2012-10-251-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix gratuitous use of ternary operatorCaleb Thompson2012-10-251-2/+5
* | | | remain backwards compatible, exception can be constructed with no argumentsAaron Patterson2012-10-251-1/+3
|/ / /