aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove tabs, use spaces :scissors:Carlos Antonio da Silva2013-01-221-2/+2
| | | | [ci skip]
* Whitespaces :scissors:Rafael Mendonça França2013-01-222-19/+16
| | | | [ci skip]
* Merge pull request #8557 from timraymond/add_back_engines_and_deprecateRafael Mendonça França2013-01-225-5/+46
|\ | | | | | | | | | | | | Adding Back Rails::Engine::Railties#engines Conflicts: railties/CHANGELOG.md
| * Adding Back Rails::Engine::Railties#enginesTim Raymond2013-01-035-5/+46
| | | | | | | | | | Removing it breaks functionality with gems such as Thinking Sphinx. This restores it with a deprecation warning. Closes #8551
* | Merge branch 'isolating_tests'Akira Matsuda2013-01-227-28/+47
|\ \ | | | | | | | | | Now we're almost ready to remove this: https://github.com/rails/rails/blob/5294ad8/activesupport/lib/active_support/test_case.rb#L29
| * | Just ignore all PRAGMA queriesAkira Matsuda2013-01-221-1/+1
| | |
| * | Reset SchemaMigration after updatingAkira Matsuda2013-01-221-0/+1
| | |
| * | Restore I18n.locale after running testsAkira Matsuda2013-01-221-1/+7
| | |
| * | Make sure to reset default_url_optionsAkira Matsuda2013-01-221-1/+5
| | |
| * | Preload some join table schemasAkira Matsuda2013-01-221-0/+9
| | |
| * | Ignore schema queries on SQLite 3 as wellAkira Matsuda2013-01-221-1/+2
| | |
| * | Be sure to clear schema cacheAkira Matsuda2013-01-221-0/+3
| | |
| * | Ignore "SHOW search_path" when counting PostgreSQL queriesAkira Matsuda2013-01-221-1/+1
| | |
| * | Reset table_name_{prefix,suffix}, and table_name after each testAkira Matsuda2013-01-221-11/+4
| | | | | | | | | | | | because some tests were not resetting them, and thus the tests were order dependent
| * | Missing repair_validationsAkira Matsuda2013-01-221-12/+14
| | |
* | | Stylistic pass at form_helper_testRafael Mendonça França2013-01-211-286/+362
| | |
* | | Capture block so content won't leak.José Mota2013-01-213-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [following pull request](https://github.com/rails/rails/pull/8916) fixed the block being passed to the appropriate helper method. However, the content being passed into the block is generating repeated markup on the page due to some weird ERb evaluation. This commit tries to capture the block's generated output so the page isn't flooded with markup. [Rafael França + José Mota] Closes #8936
* | | Update actionpack's CHANGELOG for 445f14ePiotr Sarnacki2013-01-211-0/+5
| | |
* | | Merge pull request #9021 from drogus/fix-asset-pathGuillermo Iguaran2013-01-212-2/+10
|\ \ \ | |/ / |/| | Fix asset_path in mounted engine
| * | 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)
* | | copy-edits 7e6e4f2 [ci skip]Xavier Noria2013-01-211-3/+5
| | | | | | | | | | | | | | | Capitalization in the title of the section, enumerates the environments in the usual order, adds a paragraph, and tries to use less "you"s.
* | | Merge pull request #9019 from senny/doc_custom_rails_envXavier Noria2013-01-212-1/+8
|\ \ \ | |/ / |/| | document how to create custom rails environments
| * | document how to create custom rails environmentsYves Senn2013-01-212-1/+8
|/ /
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-29 08:21:52 +0000