aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ensure cookie keys are stringsAndrew White2011-06-052-2/+12
|
* Fix adapter_test.rb to make no assumptions about the database nameJon Leighton2011-06-052-4/+16
|
* Fix typoJon Leighton2011-06-051-1/+1
|
* Merge pull request #1426 from arunagw/sprockets_gem_updateJosé Valim2011-06-051-1/+1
|\ | | | | sprockets gem update to beta9
| * sprockets gem update to beta9 Arun Agrawal2011-05-311-1/+1
| |
* | Merge pull request #1462 from arunagw/test_added_for_namedscopeJosé Valim2011-06-053-1/+14
|\ \ | | | | | | Test added for namedscope target.
| * | Test added for namedscope target.Arun Agrawal2011-06-033-1/+14
| | |
* | | Merge pull request #1488 from guilleiguaran/multiple_sources_in_sprocket_helpersJosé Valim2011-06-054-28/+40
|\ \ \ | | | | | | | | Allow multiple sources in Sprockets helpers
| * | | Allow multiple sources in Sprockets helpersGuillermo Iguaran2011-06-054-28/+40
|/ / /
* | | Bring back oracle specific crapJon Leighton2011-06-041-0/+6
| | |
* | | Refactor Active Record test connection setup. Please see the ↵Jon Leighton2011-06-04166-571/+360
| | | | | | | | | | | | RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.
* | | Force RAILS_ENV=development in rackup_test.rb. This fixes a problem on the ↵Jon Leighton2011-06-041-0/+6
| | | | | | | | | | | | CI server. For some reason the RAILS_ENV on the CI server is production, which means that the ActionDispatch::Static middleware is not used, and so the request in 'config.ru can be racked up' returns a 404 rather than a 200.
* | | adds Vijay Dev to the new Rails Guides Reviewers teamXavier Noria2011-06-052-8/+12
| | | | | | | | | | | | See http://weblog.rubyonrails.org/2011/6/2/news-from-the-documentation-front
* | | move Ryan up, since the list is ordered by surnameXavier Noria2011-06-041-4/+4
| | |
* | | adds Ryan Bigg to the credits page of the guides, he is the author of the ↵Xavier Noria2011-06-042-0/+4
| | | | | | | | | | | | new configuring guide
* | | specify image dimensions for pictures in the guides credits pageXavier Noria2011-06-041-1/+1
| | |
* | | Add missing require for cookies middlewareAndrew White2011-06-041-0/+1
| | |
* | | Refactor ActionController::TestCase cookiesAndrew White2011-06-048-65/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning cookies for test cases should now use cookies[], e.g: cookies[:email] = 'user@example.com' get :index assert_equal 'user@example.com', cookies[:email] To clear the cookies, use clear, e.g: cookies.clear get :index assert_nil cookies[:email] We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created.
* | | Merge pull request #1468 from castlerock/fix_issue_1467José Valim2011-06-030-0/+0
|\ \ \ | | | | | | | | Double assignment of attributes on a collection association occurs fixed #1467
| * | | Double assignment of attributes on a collection association occurs fixed for ↵Raghunadh2011-06-031-1/+0
| |/ / | | | | | | | | | the issue issue #1467
* / / Don't double assign attributes - closes #1467.Andrew White2011-06-031-1/+0
|/ /
* | Fix broken test. You know, the merge button will be the end of us...Jon Leighton2011-06-011-3/+3
| |
* | Merge pull request #1447 from dmathieu/empty_routePiotr Sarnacki2011-06-012-1/+9
|\ \ | | | | | | Fix creating an empty route on 1.8. Closes #1210
| * | fix creating an empty route on 1.8. Closes #1210Damien Mathieu2011-06-012-1/+9
| | |
* | | Merge pull request #1385 from smartinez87/dropAaron Patterson2011-06-011-1/+1
|\ \ \ | | | | | | | | #drop_table accepts no options now.
| * | | #drop_table accepts no options now.Sebastian Martinez2011-05-281-1/+1
| | | |
* | | | Adding commentArun Agrawal2011-06-011-0/+1
| | | |
* | | | AttributeMethodTest test fix #jrubyVishnu Atrai2011-06-011-1/+5
| | | |
* | | | Fix issue #1272Brian Mathiyakom2011-06-014-10/+24
| | | | | | | | | | | | | | | | | | | | Set reverse_order_value when asked to reverse_order(). Do the actual reversal in build_arel.
* | | | Merge pull request #1448 from ernie/attr_internal_requireJosé Valim2011-06-011-0/+2
|\ \ \ \ | |_|/ / |/| | | Require attr_internal before using in ActionView::Helpers
| * | | Require attr_internal before using in ActionView::HelpersErnie Miller2011-06-011-0/+2
| | | |
* | | | Merge pull request #1441 from guilleiguaran/no_rb_requireJosé Valim2011-06-012-2/+2
|\ \ \ \ | | | | | | | | | | Don't add .rb in requires
| * | | | Don't add .rb in requiresGuillermo Iguaran2011-05-312-2/+2
| | | | |
* | | | | Add missing require to fix the CIJon Leighton2011-06-011-0/+1
| | | | |
* | | | | Merge pull request #1439 from sikachu/isolated_pg_testAaron Patterson2011-05-312-20/+29
|\ \ \ \ \ | |/ / / / |/| | | | Isolated PostgreSQL test into PostgreSQL folder
| * | | | Isolated PostgreSQL test into PostgreSQL folderPrem Sichanugrist2011-05-312-20/+29
|/ / / /
* | | | Raise NameError instead of ArgumentError in ActiveSupport::DependenciesAndrew White2011-06-015-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::Dependencies now raises NameError if it finds an existing constant in load_missing_constant. This better reflects the nature of the error which is usually caused by calling constantize on a nested constant. Closes #1423
* | | | added an alias for new to build to the AR collection proxy, this corrects an ↵Josh Kalderimis2011-06-014-10/+27
| | | | | | | | | | | | | | | | issue where the collection proxies were not consistent
* | | | Make MemCacheStore work with Ruby 1.9 and -KuAndrew White2011-05-311-1/+1
| | | |
* | | | Merge pull request #1434 from dmathieu/mass_assignmentJosé Valim2011-05-311-1/+2
|\ \ \ \ | | | | | | | | | | Mass assignment
| * | | | no need for .rbDamien Mathieu2011-05-311-1/+1
| | | | |
| * | | | string inflections are needed for running tests in isolationDamien Mathieu2011-05-311-0/+1
| | | | |
* | | | | Revert "[activerecord][postgresql] verify if table has a schema(not ↵Jon Leighton2011-05-311-5/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | public)". This caused a test breakage. See #1410 for details. This reverts commit c44418ea4e09cc81da47edbc9ac5f31c7e32c1b4.
* | | | standarize documentation (and indirectly code) to use American English as ↵Xavier Noria2011-05-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discussed in 4f234bf Please do not perform monster patches for this until 3.1 is out. Also, no existing API should be affected by this. New code, local variables, etc. would follow this guideline to have a consistent project tree in this regard.
* | | | revises commit from pull request 1408Xavier Noria2011-05-311-4/+7
| | | |
* | | | revises commit from pull request 1409Xavier Noria2011-05-311-4/+8
| | | |
* | | | Modified generated text to explain where .js and .coffee files can be ↵Noel Gomez2011-05-311-3/+5
| | | | | | | | | | | | | | | | located and that there shouldn't be blank lines in manifest per this issue http://groups.google.com/group/rubyonrails-talk/browse_thread/thread/effb868290c2c0b8
* | | | changed text to be more explicit about where stylesheets can be locatedNoel Gomez2011-05-311-2/+5
| | | |
* | | | Ensure that calculations properly override the select value even if it's set ↵Jon Leighton2011-05-312-2/+7
| | | | | | | | | | | | | | | | in the default scope. Fixes #1395.
* | | | Failing test for aggregating on default_scope with selectErik Fonselius2011-05-312-0/+9
| | | |