aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Missing AS::Deprecation::DeprecatedObjectProxy testAkira Matsuda2013-01-231-0/+5
|
* Test that a DateTime acts_like_dateAkira Matsuda2013-01-231-0/+4
|
* Merge pull request #9031 from virusman/doc-no-asset-concatGuillermo Iguaran2013-01-222-125/+0
|\ | | | | Remove old asset tags API from docs
| * Remove old asset tags API from docs, reflecting changes from #7900virusman2013-01-232-125/+0
| |
* | Less strict activerecord-deprecated_finders versionRafael Mendonça França2013-01-221-1/+1
| |
* | Revert "Round usec when writing timestamp attribute."Andrew White2013-01-222-28/+5
| | | | | | | | | | | | | | | | | | | | This reverts commit e9d2ad395ec2ef929d74752f3d71c80674044fbe. Closes #8460 Conflicts: activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb activerecord/test/cases/dirty_test.rb
* | Add failing test case for #8460Andrew White2013-01-221-0/+14
| | | | | | | | Add a test case to ensure that fractional second updates are detected.
* | Merge pull request #9027 from carlosantoniodasilva/revert-localeSteve Klabnik2013-01-225-37/+24
|\ \ | | | | | | Revert locale
| * | Revert "Merge pull request #7873 from steveklabnik/update_initializer"Carlos Antonio da Silva2013-01-222-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 43e14f8ff203c21646f733d35bdde4e68da70a3b, reversing changes made to bb17a0f085aba40a1952612f6c98b2a5804a1152. Conflicts: railties/lib/rails/generators/rails/app/templates/config/application.rb railties/lib/rails/generators/rails/app/templates/config/initializers/locale.rb Reason: setting the Time.zone in an after_initialize block can become a problem for people upgrading, since it's not going to be available when config/initializers run, and people might be relying on it. An example that I noticed was with the Chronic gem, for date/time parsing. It requires us to configure the time class to be Time.zone, and doing that in an initializer no longer worked with these changes, so reverting is the safer path for now.
| * | Revert "Set the default timezone after the initialization since the ↵Carlos Antonio da Silva2013-01-222-27/+15
| | | | | | | | | | | | | | | | | | configuration" This reverts commit 39374aa925a7d670b039c0c0c9aa9f4aef19466b.
| * | Revert "updating i18n guide with locale config location."Carlos Antonio da Silva2013-01-221-1/+1
| |/ | | | | | | This reverts commit 46902908910c041e268429d674bbe084399cc664.
* | Lets kepp using Ruby 1.9 syntaxRafael Mendonça França2013-01-222-37/+37
| |
* | Only check for unpermmited parameters ifRafael Mendonça França2013-01-221-1/+1
|/ | | | action_on_unpermitted_parameters is present
* avoid creating an object in every callXavier Noria2013-01-221-1/+2
| | | | This was a suggestion of @carlosantoniodasilva, thanks!
* Merge pull request #9026 from tricknotes/remove-unnecessary-requireXavier Noria2013-01-221-1/+0
|\ | | | | Remove unnecessary require
| * Remove unnecessary requireRyunosuke SATO2013-01-221-1/+0
|/ | | | `require 'rubygems'` is already required in Ruby 1.9 or later.
* Re-do Getting Started application with Rails 4.Steve Klabnik2013-01-2276-301/+404
| | | | | | | The sample application with the Getting Started Guide was very out of date. I've re-done it on edge (as of 51b9def5bf108fb566e) so it should be good to go with Rails 4. It's also in synch with what the guide actually says.
* fixing link to validations guide in getting started guideSteve Klabnik2013-01-221-4/+5
|
* Getting Started Guide: strong_parametersSteve Klabnik2013-01-222-8/+33
| | | | | Stuff didn't work because of strong_parameters. Now the right calls are in place.
* Fix images in getting started guide.Steve Klabnik2013-01-225-0/+0
| | | | | We changed the error style, so they're all wrong. Now they're right. :smile:
* 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
| | |