Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #9011 from wangjohn/activerecord_transaction_state | Rafael Mendonça França | 2013-01-21 | 2 | -7/+34 | |
|\ \ | | | | | | | Refactored TransactionState into its own class | |||||
| * | | Refactored transaction state into its own object. Each transaction creates a ↵ | wangjohn | 2013-01-21 | 2 | -7/+34 | |
| | | | | | | | | | | | | new transaction state object upon initialization. | |||||
* | | | Duplicate possible frozen string from route | Andrew White | 2013-01-21 | 2 | -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 futile | Xavier Noria | 2013-01-21 | 1 | -1/+1 | |
| | | ||||||
* | | slices less, reads better | Xavier Noria | 2013-01-21 | 1 | -13/+22 | |
| | | ||||||
* | | Merge pull request #8671 from xuanxu/fix_irregular | Xavier Noria | 2013-01-21 | 2 | -0/+4 | |
|\ \ | | | | | | | Inflector irregular singularize rules | |||||
| * | | Inflector irregular singularize rules | Juanjo Bazán | 2013-01-01 | 2 | -0/+4 | |
| | | | ||||||
* | | | Merge pull request #9014 from virusman/form_helpers_ar_tests | Rafael Mendonça França | 2013-01-21 | 2 | -0/+92 | |
|\ \ \ | | | | | | | | | AR integration tests for form helpers | |||||
| * | | | Added AR integration tests for form helpers | virusman | 2013-01-21 | 2 | -0/+92 | |
| | | | | ||||||
* | | | | Use `DateTime.parse` inside `String#to_datetime` | Andrew White | 2013-01-21 | 2 | -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 White | 2013-01-21 | 8 | -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-js | Rafael Mendonça França | 2013-01-21 | 5 | -12/+134 | |
|\ \ \ \ | | | | | | | | | | | In Browser Path Matching with Javascript | |||||
| * | | | | In Browser Path Matching with Javascript | schneems | 2013-01-20 | 5 | -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_test | Rafael Mendonça França | 2013-01-21 | 1 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove extra sort from test | |||||
| * | | | | | Remove extra sort from test | Vipul A M | 2013-01-21 | 1 | -3/+3 | |
| | |/ / / | |/| | | | | | | | | | | | | | Cleanup change_schema tests to remove extra sorts on columns. | |||||
* / | | | | Fix setting expected value in translation tests | Carlos Antonio da Silva | 2013-01-21 | 1 | -2/+2 | |
|/ / / / | | | | | | | | | | | | | It was being set to nil instead due to the wrong assignment. | |||||
* | | | | Merge pull request #9007 from dpree/master | Rafael Mendonça França | 2013-01-20 | 1 | -35/+46 | |
|\ \ \ \ | |/ / / |/| | | | Enhanced tests for AbstractController::Translation module | |||||
| * | | | Removed ActionController::Base dependency from abstract controller ↵ | Jens Bissinger | 2013-01-20 | 1 | -41/+46 | |
| | | | | | | | | | | | | | | | | translation tests. | |||||
| * | | | Test abstract controller's localize method. | Jens Bissinger | 2013-01-20 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Merge pull request #8913 from ↵ | Carlos Antonio da Silva | 2013-01-20 | 2 | -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 Geihsler | 2013-01-19 | 2 | -0/+10 | |
| | | | | | ||||||
* | | | | | Refactor grep call to remove .each | Carlos Antonio da Silva | 2013-01-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Grep already yields the matching keys to the given block. | |||||
* | | | | | Add missing assert calls | Carlos Antonio da Silva | 2013-01-20 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Use 1.9 hash style in docs/comments [ci skip] | Carlos Antonio da Silva | 2013-01-20 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Fix markdown formatting to highlight block in changelog [ci skip] | Carlos Antonio da Silva | 2013-01-20 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #9008 from ranjaykrishna/dbcreate | Guillermo Iguaran | 2013-01-20 | 1 | -0/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Added a new rake task in activerecord | |||||
| * | | | | | added db:drop task that executes mysql:drop_databses and ↵ | Ranjay Krishna | 2013-01-20 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | postgresql:drop_databases | |||||
* | | | | | | Merge pull request #9006 from wangjohn/activerecord_transaction_state | Aaron Patterson | 2013-01-20 | 4 | -11/+49 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Created state for a transaction and added tests. | |||||
| * | | | | | | Added a changelog entry. | wangjohn | 2013-01-20 | 1 | -0/+5 | |
| | | | | | | | ||||||
| * | | | | | | Removed reflects_transaction_state. | wangjohn | 2013-01-20 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Created state for a transaction and added tests. | wangjohn | 2013-01-20 | 3 | -11/+45 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #9005 from ranjaykrishna/dbcreate | Aaron Patterson | 2013-01-20 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | added a db create rake task. | |||||
| * | | | | | | removed the puts statement and simplified the execute statement | Ranjay Krishna | 2013-01-20 | 1 | -6/+1 | |
| | | | | | | | ||||||
| * | | | | | | added rake db:create that executes mysql:build_databases and ↵ | Ranjay Krishna | 2013-01-20 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | postgresql:build_databases | |||||
* | | | | | | | Merge pull request #9004 from arunagw/warning_removed_shadowing_outer | Guillermo Iguaran | 2013-01-20 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removing warning: shadowing outer local variable | |||||
| * | | | | | | | Removing warning: shadowing outer local variable | Arun Agrawal | 2013-01-20 | 1 | -3/+3 | |
|/ / / / / / / | ||||||
* | | | / / / | strong parameters filters permitted scalars | Xavier Noria | 2013-01-20 | 4 | -39/+273 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Don't use anonymous classes in connection tests | Guillermo Iguaran | 2013-01-19 | 1 | -3/+5 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Anonymous class is not allowed. For reference see #8934 and bc43763247e25 | Guillermo Iguaran | 2013-01-19 | 1 | -4/+6 | |
| | | | | | ||||||
* | | | | | Merge pull request #9002 from dahakawang/master | Aaron Patterson | 2013-01-19 | 2 | -0/+15 | |
|\ \ \ \ \ | |/ / / / |/| | | | | issue #8934 sovled | |||||
| * | | | | fix anonymous class issue | David | 2013-01-20 | 2 | -0/+15 | |
|/ / / / | ||||||
* | | | | Remove warning: shadowing outer local variable | Carlos Antonio da Silva | 2013-01-19 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Fix failing test about date.order translation values | Carlos Antonio da Silva | 2013-01-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Introduced in b718998f3e8e6f3d01ad138e40f08fbcc3736285. | |||||
* | | | | Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependency | Aaron Patterson | 2013-01-19 | 3 | -6/+12 | |
|\ \ \ \ | | | | | | | | | | | Remove i18n symbol dependency | |||||
| * | | | | Don't change the original i18n data | Chris McGrath | 2013-01-17 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Remove i18n symbol dependency | Chris McGrath | 2013-01-17 | 3 | -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_store | Rafael Mendonça França | 2013-01-19 | 1 | -25/+41 | |
|\ \ \ \ \ | | | | | | | | | | | | | Refactor cache store | |||||
| * | | | | | Refactor ActiveSupport::Cache::Store#fetch. | Joey Butler | 2013-01-19 | 1 | -25/+41 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9000 from sherwu/master | Rafael Mendonça França | 2013-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Updated Gemfile to use jQuery-rails v 2.2.0 | |||||
| * | | | | | Updated version of jQuery rails in gemfile | Sherwin Wu | 2013-01-19 | 1 | -1/+1 | |
|/ / / / / |