Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6245 from bogdan/bc_timestamp | Rafael Mendonça França | 2012-11-21 | 4 | -3/+24 |
|\ | | | | | Postgresql adapter: fix handling of BC timestamps | ||||
| * | Fix postgresql adapter to handle bc timestamps correctly | Bogdan Gusiev | 2012-11-21 | 4 | -3/+24 |
| | | |||||
* | | Merge pull request #8289 from semaperepelitsa/pg_adapter_refactoring_squashed | Rafael Mendonça França | 2012-11-21 | 2 | -13/+39 |
|\ \ | |/ |/| | Refactoring, testing and documenting pg_connection.distinct | ||||
| * | Refactoring, testing and documenting pg_connection.distinct | Semyon Perepelitsa | 2012-11-21 | 2 | -13/+39 |
|/ | |||||
* | Remove return guard and use code convetions | Rafael Mendonça França | 2012-11-20 | 1 | -7/+11 |
| | |||||
* | Merge pull request #8280 from asanghi/fix_guide_field_with_error_proc | Rafael Mendonça França | 2012-11-20 | 1 | -2/+6 |
|\ | | | | | fix guide with field_with_error proc example | ||||
| * | fix guide with field_with_error proc example | Aditya Sanghi | 2012-11-20 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #8282 from arunagw/warning_removed_for_ruby2 | Carlos Antonio da Silva | 2012-11-20 | 1 | -0/+2 |
|\ \ | | | | | | | Initialize accessors to remove some warnings in Ruby 2.0 | ||||
| * | | Initialize accessors to remove some warnings in Ruby 2.0 | Arun Agrawal | 2012-11-21 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #8276 from pwnall/pgsql_text_limits | Rafael Mendonça França | 2012-11-20 | 4 | -0/+35 |
|\ \ | |/ |/| | Postgresql doesn't accepts limits on text columns | ||||
| * | Postgresql doesn't accepts limits on text columns. | Victor Costan | 2012-11-20 | 4 | -0/+35 |
|/ | |||||
* | Merge pull request #8279 from gaurish/database_error | Carlos Antonio da Silva | 2012-11-20 | 1 | -0/+4 |
|\ | | | | | Improved Error handling when parsing database.yaml, Fixes #8143 | ||||
| * | Better Error handling when parsing database.yaml | Gaurish Sharma | 2012-11-20 | 1 | -0/+4 |
|/ | | | | | Provides a better error message incase the database.yaml has some errors. | ||||
* | Merge branch 'url-for-params' | Carlos Antonio da Silva | 2012-11-19 | 3 | -2/+16 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when using a non-hash query argument named "params" in `url_for`. Before: url_for(params: "") # => undefined method `reject!' for "":String After: url_for(params: "") # => http://www.example.com?params=` Closes #8233 | ||||
| * | Correct the use of params options when given to url_for | Carlos Antonio da Silva | 2012-11-19 | 3 | -10/+16 |
| | | | | | | | | Merge url for tests and add changelog entry for #8233. | ||||
| * | Fix issue with params in url_for | tumayun | 2012-11-19 | 2 | -1/+9 |
|/ | | | | | | With a "params" argument, the following error is raised: undefined method `reject!` for "":String | ||||
* | Refactor request tests, remove #with_set method | Carlos Antonio da Silva | 2012-11-19 | 1 | -8/+3 |
| | |||||
* | Be a bit less conservative with mysql in adapter | Carlos Antonio da Silva | 2012-11-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #8212 from senny/8197_make_render_in_spacer_template_work | José Valim | 2012-11-19 | 3 | -2/+18 |
|\ | | | | | render every partial with a new `PartialRenderer`. | ||||
| * | render every partial with a new `PartialRenderer`. | Yves Senn | 2012-11-19 | 3 | -2/+18 |
|/ | | | | | | | | This resolves issues when rendering nested partials. Previously the `PartialRenderer` was reused which led to situations where the state of the renderer was reset. Closes #8197 | ||||
* | Merge pull request #8044 from nateberkopec/block_does_not_set_parts_order | Rafael Mendonça França | 2012-11-19 | 4 | -46/+31 |
|\ | | | | | Explicit multipart messages respect :parts_order | ||||
| * | Explicit multipart messages respect :parts_order | Nate Berkopec | 2012-11-19 | 4 | -46/+31 |
| | | | | | | | | | | | | | | | | | | As issue #7978, the order in which ActionMailer sends multipart messages could be unintentionally overwritten if a block is passed to the mail method. This changes the mail method such that :parts_order is always respected, regardless of whether a block is passed to mail. | ||||
* | | Add UpgradeSignatureToEncryptionCookieStore to upgrading_ruby_on_rails guide | Santiago Pastorino | 2012-11-19 | 1 | -0/+2 |
| | | |||||
* | | Fix UpgradeSignatureToEncryptionCookieStore doc | Santiago Pastorino | 2012-11-19 | 1 | -9/+4 |
|/ | |||||
* | Remove not needed begin..end from AR#save | Carlos Antonio da Silva | 2012-11-19 | 1 | -5/+3 |
| | |||||
* | Initialize accessors to remove some warnings in Ruby 2.0 | Carlos Antonio da Silva | 2012-11-19 | 2 | -7/+4 |
| | |||||
* | Merge pull request #8262 from senny/8229_correct_bundler_require_in_engines | Rafael Mendonça França | 2012-11-19 | 2 | -3/+8 |
|\ | | | | | require bundler groups to include rake-tasks in engines | ||||
| * | require bundler groups to include rake-tasks in engines | Yves Senn | 2012-11-18 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | If you generate a full engine, this will include rake tasks from your gem under the `app` namespace. For example if you have a dependency on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec` Closes #8229 | ||||
| * | cleanup, remove whitspace from railties CHANGELOG | Yves Senn | 2012-11-18 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #8256 from nalwayaabhishek/master | Carlos Antonio da Silva | 2012-11-19 | 1 | -3/+3 |
|\ \ | | | | | | | Displaying error message if validation fail in examples (p tag was missing) | ||||
| * | | displaying error message(p tag was missing) and adding output as comment | Abhishek Nalwaya | 2012-11-19 | 1 | -3/+3 |
| | | | |||||
* | | | Refactor config abort message a bit for dbconsole | Carlos Antonio da Silva | 2012-11-18 | 2 | -8/+4 |
| | | | | | | | | | | | | | | | | | | Remove not used variable. Remove config attr_reader causing warning. Fix indent in runner file. | ||||
* | | | Fix rails db command with sqlite3 database | Carlos Antonio da Silva | 2012-11-18 | 2 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using sqlite3 it was attempting to find the database file based on Rails.root, the problem is that Rails.root is not always present because we try to first manually load "config/database.yml" instead of loading the entire app, to make "rails db" faster. This means that when we're in the root path of the app, calling "rails db" won't allow us to use Rails.root, making the command fail for sqlite3 with the error: ./rails/commands/dbconsole.rb:62:in `start': undefined method `root' for Rails:Module (NoMethodError) The fix is to simply not pass any dir string to File.expand_path, which will make it use the current directory of the process as base, or the root path of the app, which is what we want. When we are in any other subdirectory, calling "rails db" should work just fine, because "config/database.yml" won't be found, thus "rails db" will fallback to loading the app, making Rails.root available. Closes #8257. | ||||
* | | | Merge pull request #3023 from Tho85/preserve_sti_type | Rafael Mendonça França | 2012-11-18 | 3 | -2/+31 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | AR::Base.becomes should not change the STI type Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | AR::Base.becomes should not change the STI type | Thomas Hollstegge | 2012-11-17 | 3 | -2/+31 |
| | | | | | | | | | | | | | | | | If you want to change the STI type too, use AR::Base.becomes! instead | ||||
* | | | | Merge pull request #8266 from CvX/index_rename | Rafael Mendonça França | 2012-11-18 | 3 | -0/+23 |
|\ \ \ \ | | | | | | | | | | | Add rename_index to change_table. | ||||
| * | | | | Add rename_index to change_table. | Jarek Radosz | 2012-11-19 | 3 | -0/+23 |
|/ / / / | |||||
* | | | | Merge branch 'deprecate-pending' | Carlos Antonio da Silva | 2012-11-18 | 4 | -2/+24 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly deprecate #pending from AS::TestCase. This has been previously removed from master, and is now back with a deprecation instead, to avoid people having tests breaking when upgrading an app. Please check #4575 for more background. | ||||
| * | | | | Properly deprecate #pending from AS::TestCase | Carlos Antonio da Silva | 2012-11-18 | 3 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | Check https://github.com/rails/rails/pull/4575#issuecomment-5765575. | ||||
| * | | | | Revert "Merge pull request #4575 from carlosantoniodasilva/remove-test-pending" | Carlos Antonio da Silva | 2012-11-18 | 3 | -2/+22 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1620df78dff527b4fa3f7b204fa05d1b630aae17, reversing changes made to 2d000328dfc0d4b297fb4bdcebc9af6c2fb559dc. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/test_case.rb | ||||
* | | | | Ensure ordering to make the test pass with postgresql | Carlos Antonio da Silva | 2012-11-18 | 1 | -4/+5 |
| | | | | |||||
* | | | | Merge pull request #8258 from kommen/eager_loading_with_select_test2 | Carlos Antonio da Silva | 2012-11-18 | 1 | -0/+13 |
|\ \ \ \ | |_|_|/ |/| | | | Add test to ensure preloading works as expected with "group", "select" and "includes". | ||||
| * | | | Add test to ensure preloading works as expected with "select" and "includes". | Dieter Komendera | 2012-11-18 | 1 | -0/+13 |
| | |/ | |/| | | | | | | | This didn't work in rails 3.1. See #2303 for more information and original pull request. | ||||
* | | | Merge pull request #8260 from sauliusg/improved_deprecation_notice | Rafael Mendonça França | 2012-11-18 | 1 | -4/+6 |
|\ \ \ | | | | | | | | | Point user to strong_parameters as the new protection model [ci skip] | ||||
| * | | | Point user to strong_parameters as the new protection model [ci skip] | Saulius Grigaliunas | 2012-11-18 | 1 | -4/+6 |
| |/ / | |||||
* | | | Merge pull request #8259 from senny/make_queued_message_autoloadable | Rafael Mendonça França | 2012-11-18 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | make ActionMailer::QueuedMessage autoloadable | ||||
| * | | make ActionMailer::QueuedMessage autoloadable | Yves Senn | 2012-11-18 | 1 | -0/+1 |
|/ / | |||||
* | | Upgrade mail dependency to 2.5.2 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 |
| | | |||||
* | | Remove not used require and some useless test comments | Carlos Antonio da Silva | 2012-11-17 | 2 | -14/+3 |
| | | |||||
* | | Bump mysql gem version to the newly 2.9.0, fix build. | Carlos Antonio da Silva | 2012-11-17 | 2 | -2/+2 |
| | |