aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix that failed tests should exit with a nonzero error code.Jeremy Kemper2012-02-102-31/+17
| | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask!
* Merge pull request #4988 from kennyj/fix_4720-3Aaron Patterson2012-02-102-0/+31
| | | | Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
* Merge pull request #4941 from rafaelfranca/fix-buildJosé Valim2012-02-081-3/+3
|\ | | | | Use real table and columns for index test
| * Use real table and columns for index testRafael Mendonça França2012-02-081-3/+3
|/
* Push proper test changes for previous commit conflicts.José Valim2012-02-081-2/+4
|
* Handle nil in add_index :length option in MySQLPaul Sadauskas2012-02-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | Our schema.rb is being generated with an `add_index` line similar to this: add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil} This is the same as it was on Rails 3.1.3, however, now when that schema.rb is evaluated, its generating bad SQL in MySQL: Mysql::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1: CREATE UNIQUE INDEX `xxx` ON `foo` (`foo`(8), `bar`()) This commit adds a check for nil on the length attribute to prevent the empty parens from being output. Conflicts: activerecord/test/cases/migration/index_test.rb Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-073-0/+25
| | | | | | Conflicts: activerecord/lib/active_record/core.rb
* always flush all logs. fixes #4277Aaron Patterson2012-02-071-1/+1
|
* no need to check for this constantXavier Noria2012-02-071-1/+1
|
* Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_paramsJosé Valim2012-02-074-0/+24
|\ | | | | Fixed force_ssl redirects to include original query params
| * Added unit test to cover changes to RouteSet.url_forRyan McGeary2012-02-071-0/+16
| | | | | | | | | | ActionDispatch::Routing::RouteSet.url_for now handles passing params through to ActionDispatch::Http::Url.url_for
| * Fixed force_ssl redirects to include original query paramsRyan McGeary2012-02-063-0/+8
| | | | | | | | | | | | `ActionController.force_ssl` redirects http URLs to their https equivalent; however, when a URL contains a query string, the resulting redirect lacked the original query string.
* | Fixed the documenation for 'to_xml'Markus Fenske2012-02-071-1/+2
| |
* | Merge pull request #4920 from guilleiguaran/revert-gemfile-edgeJosé Valim2012-02-073-4/+4
|\ \ | | | | | | In Rails 3.2.x --edge generate apps with rails 3-2-stable
| * | --edge option should generate app with rails 3-2-stableGuillermo Iguaran2012-02-073-4/+4
|/ /
* / let automatic EXPLAIN ignore CACHE notificationsXavier Noria2012-02-032-1/+52
|/
* Merge pull request #4912 from guilleiguaran/fix-edge-gemfileAaron Patterson2012-02-061-2/+2
|\ | | | | Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)
| * Add branch to sass-rails and coffee-rails for apps generated with --dev or ↵Guillermo Iguaran2012-02-061-2/+2
|/ | | | --edge options (3.2.x)
* Merge pull request #4908 from kennyj/fix_3864José Valim2012-02-062-1/+34
| | | | Fix url_for method's behavior. GH #3684.
* Merge pull request #4890 from kennyj/improvement_4883Santiago Pastorino2012-02-052-3/+4
|\ | | | | GH #4883. Optional start_day argument for Time#all_week
| * GH #4883. Optional start_day argument for Time#all_weekkennyj2012-02-052-3/+4
|/
* Clean up a bit default_response handling and cache format negotiation.José Valim2012-02-042-19/+17
|
* Merge pull request #4870 from sikachu/3-2-stable-responder-fixJosé Valim2012-02-044-8/+60
|\ | | | | Fix override API response bug in respond_with
| * Fix override API response bug in respond_withPrem Sichanugrist2012-02-034-8/+60
| | | | | | | | | | | | | | | | | | | | Default responder was only using the given respond block when user requested for HTML format, or JSON/XML format with valid resource. This fix the responder so that it will use the given block regardless of the validity of the resource. Note that in this case you'll have to check for object's validity by yourself in the controller. Fixes #4796
* | Merge pull request #4879 from kennyj/fix_4873José Valim2012-02-042-2/+9
| | | | | | | | Fix GH #4873. Allow swapping same class middleware.
* | Merge pull request #4868 from skult/3-2-stableAaron Patterson2012-02-031-1/+1
|\ \ | |/ |/| Fix Issue #4819
| * Fix Issue #4819densya2032012-02-041-1/+1
|/ | | | | | 'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1' Just a typo of 'ActiveSupport::...'
* Merge pull request #4809 from cfeist/feist-sqlite-binary-corruptionAaron Patterson2012-02-023-17/+3
| | | | Fix for SQLite binary data corrupter (to master branch)
* Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-012-2/+13
| | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by
* Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-newJosé Valim2012-02-012-3/+7
|\ | | | | Fix plugin_new test failure from c8c84397
| * Fix plugin_new test failure from c8c84397Prem Sichanugrist2012-02-012-3/+7
|/ | | | | `plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so you can't check for that.
* Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2José Valim2012-02-013-11/+19
|\ | | | | Generate strict validation error messages with attribute name (3-2-stable)
| * Generate strict validation error messages with attribute nameCarlos Antonio da Silva2012-02-013-11/+19
| | | | | | | | Backported from master.
* | Merge pull request #4815 from kennyj/fix_4749Santiago Pastorino2012-02-012-2/+7
|\ \ | | | | | | Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
| * | Fix GH #4749. Remove branch options, because edge is not 3-2-stable.kennyj2012-02-012-2/+7
| | |
* | | Merge pull request #4811 from rafaelfranca/3-2-stable-fixSantiago Pastorino2012-01-313-13/+13
|\| | | | | | | | Fix broken build in 3-2-stable branch
| * | Fix broken tests added by 85c724d59Rafael Mendonça França2012-01-313-13/+13
|/ /
* | Improve deprecation messageJon Leighton2012-01-311-7/+17
| |
* | Merge pull request #4735 from arton/masterAaron Patterson2012-01-311-1/+5
| | | | | | | | Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
* | Merge pull request #4779 from bsodmike/bsodmike-3-2-stableAaron Patterson2012-01-311-1/+1
|\ \ | | | | | | Update comment in Gemfile re Unicorn (minor clarification)
| * | clarification to prevent confusing newbies; Passenger/Unicorn are app ↵Michael de Silva2012-01-311-1/+1
| | | | | | | | | | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
* | | Merge pull request #4793 from kennyj/fix_4760José Valim2012-01-312-2/+11
|\ \ \ | | | | | | | | [3-2-stable] Fix GH #4760. A Block was not evaluated.
| * | | Fix GH #4760. A Block was not evaluated.kennyj2012-01-312-2/+11
| | | |
* | | | Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-313-1/+6
| | | | | | | | | | | | | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL)
* | | | Merge pull request #4790 from marten/fix-require-deprecation-in-activesupportJosé Valim2012-01-314-0/+7
|\ \ \ \ | | | | | | | | | | Fix Deprecation usage in ActiveSupport when requiring only parts of AS
| * | | | Fix use of Deprecation without requiring active_support/deprecation in whiny nilMarten Veldthuis2012-01-311-0/+2
| | | | |
| * | | | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | message verifier
| * | | | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+2
| | | | | | | | | | | | | | | | | | | | ActiveSupport::Concern in Base64
| * | | | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+2
|/ / / / | | | | | | | | | | | | ActiveSupport::Concern
* | | | Merge pull request #4786 from lest/patch-2José Valim2012-01-311-1/+1
|\ \ \ \ | |/ / / |/| | | fix assets test in 3-2-stable
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:13:15 +0000