aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-093-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize. Fix session['flash'] deletion condition: it will never be empty?, it will either be nil or a hash with 'discard' and 'flashes' keys.
* | | Merge pull request #7716 from steveklabnik/issue_7715Rafael Mendonça França2012-11-212-1/+8
|\ \ \ | | | | | | | | Coerce strings in create_join_table.
| * | | Coerce strings in create_join_table.Steve Klabnik2012-11-212-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If you accidentally pass a string and a symbol, this breaks. So we coerce them both to strings. Fixes #7715
* | | | Merge pull request #8290 from cpatuzzo/masterCarlos Antonio da Silva2012-11-211-1/+1
|\ \ \ \ | | | | | | | | | | Fixed a typo
| * | | | TypoChris Patuzzo2012-11-211-1/+1
|/ / / /
* | | | Merge pull request #6245 from bogdan/bc_timestampRafael Mendonça França2012-11-214-3/+24
|\ \ \ \ | | | | | | | | | | Postgresql adapter: fix handling of BC timestamps
| * | | | Fix postgresql adapter to handle bc timestamps correctlyBogdan Gusiev2012-11-214-3/+24
| | | | |
* | | | | Merge pull request #8289 from semaperepelitsa/pg_adapter_refactoring_squashedRafael Mendonça França2012-11-212-13/+39
|\ \ \ \ \ | |/ / / / |/| | | | Refactoring, testing and documenting pg_connection.distinct
| * | | | Refactoring, testing and documenting pg_connection.distinctSemyon Perepelitsa2012-11-212-13/+39
|/ / / /
* | | | Remove return guard and use code convetionsRafael Mendonça França2012-11-201-7/+11
| | | |
* | | | Merge pull request #8280 from asanghi/fix_guide_field_with_error_procRafael Mendonça França2012-11-201-2/+6
|\ \ \ \ | | | | | | | | | | fix guide with field_with_error proc example
| * | | | fix guide with field_with_error proc exampleAditya Sanghi2012-11-201-2/+6
| | | | |
* | | | | Merge pull request #8282 from arunagw/warning_removed_for_ruby2Carlos Antonio da Silva2012-11-201-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Initialize accessors to remove some warnings in Ruby 2.0
| * | | | | Initialize accessors to remove some warnings in Ruby 2.0Arun Agrawal2012-11-211-0/+2
|/ / / / /
* | | | | Merge pull request #8276 from pwnall/pgsql_text_limitsRafael Mendonça França2012-11-204-0/+35
|\ \ \ \ \ | |/ / / / |/| | | | Postgresql doesn't accepts limits on text columns
| * | | | Postgresql doesn't accepts limits on text columns.Victor Costan2012-11-204-0/+35
|/ / / /
* | | | Merge pull request #8279 from gaurish/database_errorCarlos Antonio da Silva2012-11-201-0/+4
|\ \ \ \ | | | | | | | | | | Improved Error handling when parsing database.yaml, Fixes #8143
| * | | | Better Error handling when parsing database.yamlGaurish Sharma2012-11-201-0/+4
|/ / / / | | | | | | | | | | | | | | | | Provides a better error message incase the database.yaml has some errors.
* | | | Merge branch 'url-for-params'Carlos Antonio da Silva2012-11-193-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_forCarlos Antonio da Silva2012-11-193-10/+16
| | | | | | | | | | | | | | | | | | | | Merge url for tests and add changelog entry for #8233.
| * | | | Fix issue with params in url_fortumayun2012-11-192-1/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | With a "params" argument, the following error is raised: undefined method `reject!` for "":String
* | | | Refactor request tests, remove #with_set methodCarlos Antonio da Silva2012-11-191-8/+3
| | | |
* | | | Be a bit less conservative with mysql in adapterCarlos Antonio da Silva2012-11-191-1/+1
| | | |
* | | | Merge pull request #8212 from senny/8197_make_render_in_spacer_template_workJosé Valim2012-11-193-2/+18
|\ \ \ \ | | | | | | | | | | render every partial with a new `PartialRenderer`.
| * | | | render every partial with a new `PartialRenderer`.Yves Senn2012-11-193-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_orderRafael Mendonça França2012-11-194-46/+31
|\ \ \ \ | | | | | | | | | | Explicit multipart messages respect :parts_order
| * | | | Explicit multipart messages respect :parts_orderNate Berkopec2012-11-194-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 guideSantiago Pastorino2012-11-191-0/+2
| | | | |
* | | | | Fix UpgradeSignatureToEncryptionCookieStore docSantiago Pastorino2012-11-191-9/+4
|/ / / /
* | | | Remove not needed begin..end from AR#saveCarlos Antonio da Silva2012-11-191-5/+3
| | | |
* | | | Initialize accessors to remove some warnings in Ruby 2.0Carlos Antonio da Silva2012-11-192-7/+4
| | | |
* | | | Merge pull request #8262 from senny/8229_correct_bundler_require_in_enginesRafael Mendonça França2012-11-192-3/+8
|\ \ \ \ | | | | | | | | | | require bundler groups to include rake-tasks in engines
| * | | | require bundler groups to include rake-tasks in enginesYves Senn2012-11-182-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 CHANGELOGYves Senn2012-11-181-2/+2
| | | | |
* | | | | Merge pull request #8256 from nalwayaabhishek/masterCarlos Antonio da Silva2012-11-191-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 Nalwaya2012-11-191-3/+3
| | | | | |
* | | | | | Refactor config abort message a bit for dbconsoleCarlos Antonio da Silva2012-11-182-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove not used variable. Remove config attr_reader causing warning. Fix indent in runner file.
* | | | | | Fix rails db command with sqlite3 databaseCarlos Antonio da Silva2012-11-182-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_typeRafael Mendonça França2012-11-183-2/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AR::Base.becomes should not change the STI type Conflicts: activerecord/CHANGELOG.md
| * | | | | | AR::Base.becomes should not change the STI typeThomas Hollstegge2012-11-173-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If you want to change the STI type too, use AR::Base.becomes! instead
* | | | | | | Merge pull request #8266 from CvX/index_renameRafael Mendonça França2012-11-183-0/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add rename_index to change_table.
| * | | | | | | Add rename_index to change_table.Jarek Radosz2012-11-193-0/+23
|/ / / / / / /
* | | | | | | Merge branch 'deprecate-pending'Carlos Antonio da Silva2012-11-184-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::TestCaseCarlos Antonio da Silva2012-11-183-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 Silva2012-11-183-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 postgresqlCarlos Antonio da Silva2012-11-181-4/+5
| | | | | | |
* | | | | | | Merge pull request #8258 from kommen/eager_loading_with_select_test2Carlos Antonio da Silva2012-11-181-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 Komendera2012-11-181-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_noticeRafael Mendonça França2012-11-181-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 Grigaliunas2012-11-181-4/+6
| |/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 18:58:41 +0000