aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix asset_path in mounted enginePiotr Sarnacki2013-01-212-2/+10
| | | | | | | | | | | | | Historically serving assets from a mountable engine could be achieved by running ActionDispatch::Static as a part of engine middleware stack or to copy assets prefixed with an engine name. After introduction of assets pipeline this is not needed as all of the assets are served or compiled into main application's assets. This commit removes the obsolete line making asset_path always generate paths relative to the root or config.relative_url_root if it's set. (closes #8119)
* Merge pull request #9011 from wangjohn/activerecord_transaction_stateRafael Mendonça França2013-01-212-7/+34
|\ | | | | Refactored TransactionState into its own class
| * Refactored transaction state into its own object. Each transaction creates a ↵wangjohn2013-01-212-7/+34
| | | | | | | | new transaction state object upon initialization.
* | Duplicate possible frozen string from routeAndrew White2013-01-212-2/+12
|/ | | | | | | | | | | | | Ruby 1.9 freezes Hash string keys by default so where a route is defined like this: get 'search' => 'search' then the Mapper will derive the action from the key. This blows up later when the action is added to the parameters hash and the encoding is forced. Closes #3429
* resistance is futileXavier Noria2013-01-211-1/+1
|
* slices less, reads betterXavier Noria2013-01-211-13/+22
|
* Merge pull request #8671 from xuanxu/fix_irregularXavier Noria2013-01-212-0/+4
|\ | | | | Inflector irregular singularize rules
| * Inflector irregular singularize rulesJuanjo Bazán2013-01-012-0/+4
| |
* | Merge pull request #9014 from virusman/form_helpers_ar_testsRafael Mendonça França2013-01-212-0/+92
|\ \ | | | | | | AR integration tests for form helpers
| * | Added AR integration tests for form helpersvirusman2013-01-212-0/+92
| | |
* | | Use `DateTime.parse` inside `String#to_datetime`Andrew White2013-01-212-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the standard library's `DateTime.parse` because it's marginally faster and supports partial date/time strings. Benchmark: user system total real old 3.980000 0.000000 3.980000 ( 3.987606) new 3.640000 0.010000 3.650000 ( 3.641342)
* | | Standardise the return value of `to_time`Andrew White2013-01-218-37/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit standardises the return value of `to_time` to an instance of `Time` in the local system timezone, matching the Ruby core and standard library behavior. The default form for `String#to_time` has been changed from :utc to :local but research seems to suggest the latter is the more common form. Also fix an edge condition with `String#to_time` where the string has a timezone offset in it and the mode is :local. e.g: # Before: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 05:00:00 -0500 # After: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 00:00:00 -0500 Closes #2453
* | | Merge pull request #9001 from schneems/schneems/routes-path-jsRafael Mendonça França2013-01-215-12/+134
|\ \ \ | | | | | | | | In Browser Path Matching with Javascript
| * | | In Browser Path Matching with Javascriptschneems2013-01-205-12/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When debugging routes ,it can sometimes be difficult to understand exactly how the paths are matched. This PR adds a JS based path matching widget to the `/rails/info/routes` output. You can enter in a path, and it will tell you which of the routes that path matches, while preserving order (top match wins). The matching widget in action: ![](http://f.cl.ly/items/3A2F0v2m3m1Z1p3P3O3k/path-match.gif) Prior to this PR the only way to check matching paths is via mental math, or typing in a path in the url bar and seeing where it goes. This feature will be an invaluable debugging tool by dramatically decreasing the time needed to check a path match. ATP actionpack
* | | | Merge pull request #9010 from vipulnsward/remove_extra_sort_from_testRafael Mendonça França2013-01-211-3/+3
|\ \ \ \ | | | | | | | | | | Remove extra sort from test
| * | | | Remove extra sort from testVipul A M2013-01-211-3/+3
| | |/ / | |/| | | | | | | | | | Cleanup change_schema tests to remove extra sorts on columns.
* / | | Fix setting expected value in translation testsCarlos Antonio da Silva2013-01-211-2/+2
|/ / / | | | | | | | | | It was being set to nil instead due to the wrong assignment.
* | | Merge pull request #9007 from dpree/masterRafael Mendonça França2013-01-201-35/+46
|\ \ \ | |/ / |/| | Enhanced tests for AbstractController::Translation module
| * | Removed ActionController::Base dependency from abstract controller ↵Jens Bissinger2013-01-201-41/+46
| | | | | | | | | | | | translation tests.
| * | Test abstract controller's localize method.Jens Bissinger2013-01-201-0/+6
| | |
* | | Merge pull request #8913 from ↵Carlos Antonio da Silva2013-01-202-0/+10
|\ \ \ | | | | | | | | | | | | | | | | seejee/regression_test_for_chained_preloaded_scopes Added test case to prevent regression of chained, preloaded scopes.
| * | | 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
| | | | | | | | | | | | | | | | Grep already yields the matching keys to the given block.
* | | | 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 a new rake task in activerecord
| * | | | added db:drop task that executes mysql:drop_databses and ↵Ranjay Krishna2013-01-201-0/+1
| | | | | | | | | | | | | | | | | | | | postgresql:drop_databases
* | | | | Merge pull request #9006 from wangjohn/activerecord_transaction_stateAaron Patterson2013-01-204-11/+49
|\ \ \ \ \ | | | | | | | | | | | | Created state for a transaction and added tests.
| * | | | | 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
|\ \ \ \ \ \ | | |/ / / / | |/| | | | added a db create rake task.
| * | | | | removed the puts statement and simplified the execute statementRanjay Krishna2013-01-201-6/+1
| | | | | |
| * | | | | added rake db:create that executes mysql:build_databases and ↵Ranjay Krishna2013-01-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | postgresql:build_databases
* | | | | | Merge pull request #9004 from arunagw/warning_removed_shadowing_outerGuillermo Iguaran2013-01-201-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removing warning: shadowing outer local variable
| * | | | | | 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
|\ \ \ \ | |/ / / |/| | | issue #8934 sovled
| * | | 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
| | | | | | | | | | | | Introduced in b718998f3e8e6f3d01ad138e40f08fbcc3736285.
* | | Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependencyAaron Patterson2013-01-193-6/+12
|\ \ \ | | | | | | | | Remove i18n symbol dependency
| * | | Don't change the original i18n dataChris McGrath2013-01-171-1/+1
| | | |
| * | | Remove i18n symbol dependencyChris McGrath2013-01-173-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date.order is the only key in rails i18n that is required to be a symbol. This patch allows for symbols or strings which means: * No requirement for symbol type in .yml files. A future YAML.safe_load wouldn't need to load symbols * Rails could actually use json rather than yml as the backend
* | | | Merge pull request #8081 from JoeyButler/refactor_cache_storeRafael Mendonça França2013-01-191-25/+41
|\ \ \ \ | | | | | | | | | | Refactor cache store
| * | | | 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 Gemfile to use jQuery-rails v 2.2.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 17:49:59 +0000