aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Standardise the return value of `to_time`Andrew White2013-01-218-37/+97
* | | | | | | Merge pull request #9001 from schneems/schneems/routes-path-jsRafael Mendonça França2013-01-215-12/+134
|\ \ \ \ \ \ \
| * | | | | | | In Browser Path Matching with Javascriptschneems2013-01-205-12/+134
* | | | | | | | Merge pull request #9010 from vipulnsward/remove_extra_sort_from_testRafael Mendonça França2013-01-211-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extra sort from testVipul A M2013-01-211-3/+3
| | |/ / / / / / | |/| | | | | |
* / | | | | | | Fix setting expected value in translation testsCarlos Antonio da Silva2013-01-211-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #9007 from dpree/masterRafael Mendonça França2013-01-201-35/+46
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Removed ActionController::Base dependency from abstract controller translatio...Jens Bissinger2013-01-201-41/+46
| * | | | | | Test abstract controller's localize method.Jens Bissinger2013-01-201-0/+6
* | | | | | | Merge pull request #8913 from seejee/regression_test_for_chained_preloaded_sc...Carlos Antonio da Silva2013-01-202-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Added test case to prevent regression of chained, preloaded scopes. (#7490)Chris Geihsler2013-01-192-0/+10
* | | | | | | | Refactor grep call to remove .eachCarlos Antonio da Silva2013-01-201-1/+1
* | | | | | | | Add missing assert callsCarlos Antonio da Silva2013-01-201-2/+2
* | | | | | | | Use 1.9 hash style in docs/comments [ci skip]Carlos Antonio da Silva2013-01-201-3/+3
* | | | | | | | Fix markdown formatting to highlight block in changelog [ci skip]Carlos Antonio da Silva2013-01-201-2/+2
* | | | | | | | Merge pull request #9008 from ranjaykrishna/dbcreateGuillermo Iguaran2013-01-201-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | added db:drop task that executes mysql:drop_databses and postgresql:drop_data...Ranjay Krishna2013-01-201-0/+1
* | | | | | | | | Merge pull request #9006 from wangjohn/activerecord_transaction_stateAaron Patterson2013-01-204-11/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added a changelog entry.wangjohn2013-01-201-0/+5
| * | | | | | | | | Removed reflects_transaction_state.wangjohn2013-01-201-1/+0
| * | | | | | | | | Created state for a transaction and added tests.wangjohn2013-01-203-11/+45
* | | | | | | | | | Merge pull request #9005 from ranjaykrishna/dbcreateAaron Patterson2013-01-201-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | removed the puts statement and simplified the execute statementRanjay Krishna2013-01-201-6/+1
| * | | | | | | | | added rake db:create that executes mysql:build_databases and postgresql:build...Ranjay Krishna2013-01-201-0/+9
* | | | | | | | | | Merge pull request #9004 from arunagw/warning_removed_shadowing_outerGuillermo Iguaran2013-01-201-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removing warning: shadowing outer local variable Arun Agrawal2013-01-201-3/+3
|/ / / / / / / / / /
* | | | / / / / / / strong parameters filters permitted scalarsXavier Noria2013-01-204-39/+273
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Don't use anonymous classes in connection testsGuillermo Iguaran2013-01-191-3/+5
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Anonymous class is not allowed. For reference see #8934 and bc43763247e25Guillermo Iguaran2013-01-191-4/+6
* | | | | | | | Merge pull request #9002 from dahakawang/masterAaron Patterson2013-01-192-0/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix anonymous class issueDavid2013-01-202-0/+15
|/ / / / / / /
* | | | | | | Remove warning: shadowing outer local variableCarlos Antonio da Silva2013-01-191-1/+1
* | | | | | | Fix failing test about date.order translation valuesCarlos Antonio da Silva2013-01-191-1/+1
* | | | | | | Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependencyAaron Patterson2013-01-193-6/+12
|\ \ \ \ \ \ \
| * | | | | | | Don't change the original i18n dataChris McGrath2013-01-171-1/+1
| * | | | | | | Remove i18n symbol dependencyChris McGrath2013-01-173-6/+12
* | | | | | | | Merge pull request #8081 from JoeyButler/refactor_cache_storeRafael Mendonça França2013-01-191-25/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor ActiveSupport::Cache::Store#fetch.Joey Butler2013-01-191-25/+41
* | | | | | | | | Merge pull request #9000 from sherwu/masterRafael Mendonça França2013-01-191-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Updated version of jQuery rails in gemfileSherwin Wu2013-01-191-1/+1
|/ / / / / / / /
* | | | | | | | Restore and adapt the implementation reverted atRafael Mendonça França2013-01-195-37/+114
* | | | | | | | Merge pull request #8999 from thomasfedb/raise_or_log_unpermitted_paramsRafael Mendonça França2013-01-194-6/+117
|\ \ \ \ \ \ \ \
| * | | | | | | | Added ability to raise or log on unpermitted params.Thomas Drake-Brockman2013-01-204-6/+117
|/ / / / / / / /
* | | | | | | | Improve relation docs about to_sql and where_values_hashCarlos Antonio da Silva2013-01-191-4/+4
* | | | | | | | Merge pull request #8977 from Soylent/masterAaron Patterson2013-01-182-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is empty stringKonstantin Papkovskiy2013-01-172-1/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix syntax error :grin:Guillermo Iguaran2013-01-181-1/+1
* | | | | | | | Merge pull request #8995 from schneems/schneems/formatting-the-formattersGuillermo Iguaran2013-01-181-6/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove "Application" section title from routesschneems2013-01-181-6/+13
|/ / / / / / / /
* | | | | | | | Merge pull request #8994 from Springest/fix_default_scope_update_all_delete_allJon Leighton2013-01-183-2/+33
|\ \ \ \ \ \ \ \