Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #7595 from guilleiguaran/update-ap-changelog | Rafael Mendonça França | 2012-09-17 | 1 | -0/+13 | |
|\ \ \ | ||||||
| * | | | Add missing entries in AP changelog | Guillermo Iguaran | 2012-09-16 | 1 | -0/+13 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #7667 from kennyj/fix_unnecessary_code_20120917 | Rafael Mendonça França | 2012-09-17 | 1 | -1/+0 | |
|\ \ \ | ||||||
| * | | | Remove unncessary code. | kennyj | 2012-09-17 | 1 | -1/+0 | |
* | | | | Merge pull request #7664 from arunagw/build_fix_railties | Rafael Mendonça França | 2012-09-17 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix build for Queue. | Arun Agrawal | 2012-09-17 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b2383... | Rafael Mendonça França | 2012-09-17 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix warning: method redefine. Testcase name are duplicated. | kennyj | 2012-09-17 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Use synchronous queue by default. Separate queued message delivery jobs from ... | Jeremy Kemper | 2012-09-16 | 5 | -27/+30 | |
* | | | Always run jobs using a consumer, even in synchronous & test queues, to ensur... | Jeremy Kemper | 2012-09-16 | 4 | -69/+108 | |
|/ / | ||||||
* | | Merge pull request #7662 from frodsan/ar_changelog | Rafael Mendonça França | 2012-09-16 | 1 | -44/+68 | |
|\ \ | ||||||
| * | | improve AR/CHANGELOG [ci skip] | Francesco Rodriguez | 2012-09-16 | 1 | -44/+68 | |
|/ / | ||||||
* | | Merge pull request #7547 from danmcclain/pg-arrays | Rafael Mendonça França | 2012-09-16 | 12 | -53/+435 | |
|\ \ | ||||||
| * | | Moves column dump specific code to a module included in AbstractAdapter | Dan McClain | 2012-09-14 | 12 | -53/+435 | |
* | | | Remove debug code :bomb: | Rafael Mendonça França | 2012-09-16 | 1 | -1/+0 | |
* | | | Merge pull request #7651 from steveklabnik/issue_3956 | Rafael Mendonça França | 2012-09-16 | 2 | -2/+33 | |
|\ \ \ | ||||||
| * | | | Don't preserve SELECT columns on COUNT | Steve Klabnik | 2012-09-16 | 2 | -2/+33 | |
* | | | | Merge pull request #7645 from larrylv/configurable-defaults | Rafael Mendonça França | 2012-09-16 | 3 | -8/+45 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | set up config_accessor with a default value by block | Larry Lv | 2012-09-17 | 3 | -8/+45 | |
|/ / / | ||||||
* | | | Merge pull request #7657 from kennyj/fix_6458-2 | Piotr Sarnacki | 2012-09-16 | 3 | -1/+14 | |
|\ \ \ | ||||||
| * | | | Don't explain except normal CRUD sql. | kennyj | 2012-09-17 | 3 | -1/+14 | |
* | | | | Merge pull request #7652 from toshi-kawanishi/find_in_batches | Carlos Antonio da Silva | 2012-09-16 | 4 | -6/+38 | |
|\| | | | ||||||
| * | | | Fix find_in_batches with customized primary_key | Toshiyuki Kawanishi | 2012-09-16 | 4 | -6/+38 | |
|/ / / | ||||||
* | | | Merge pull request #7648 from kennyj/rename_2_schema | Rafael Mendonça França | 2012-09-15 | 2 | -5/+5 | |
|\ \ \ | ||||||
| * | | | Query for sequence info also should be markd as SCHEMA. | kennyj | 2012-09-15 | 1 | -3/+3 | |
| * | | | Query for loading index info should be marked as SCHEMA. | kennyj | 2012-09-15 | 2 | -2/+2 | |
* | | | | Merge pull request #7656 from czarneckid/clarify-documentation | Xavier Noria | 2012-09-15 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Clarify the documentation on the Rails::Application#call method | David Czarnecki | 2012-09-15 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Check if etag exists before to do the gsub | Rafael Mendonça França | 2012-09-15 | 1 | -2/+4 | |
* | | | | Merge pull request #7655 from steveklabnik/master | Rafael Mendonça França | 2012-09-15 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | fix the build | Steve Klabnik | 2012-09-15 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Merge pull request #7643 from steveklabnik/deprecate_silence | Rafael Mendonça França | 2012-09-15 | 3 | -12/+23 | |
|\ \ \ | ||||||
| * | | | Deprecate ActiveSupport::Benchmarkable#silence. | Steve Klabnik | 2012-09-15 | 3 | -12/+23 | |
* | | | | Merge pull request #7654 from steveklabnik/issue_4857 | Xavier Noria | 2012-09-15 | 1 | -0/+8 | |
|\ \ \ \ | ||||||
| * | | | | Improve Process::Status#to_json | Steve Klabnik | 2012-09-15 | 1 | -0/+8 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #7649 from steveklabnik/issue_2520 | Rafael Mendonça França | 2012-09-15 | 3 | -1/+48 | |
|\ \ \ \ | ||||||
| * | | | | Support for multiple etags in an If-None-Match header | Travis Warlick | 2012-09-15 | 3 | -1/+48 | |
| |/ / / | ||||||
* | | | | Fix syntax error in assert_match | Rafael Mendonça França | 2012-09-15 | 1 | -6/+6 | |
* | | | | Merge pull request #7653 from arunagw/warnings-removed | Rafael Mendonça França | 2012-09-15 | 1 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | Few more warnings removed. | Arun Agrawal | 2012-09-15 | 2 | -4/+4 | |
| |/ / / | ||||||
* / / / | simplify rescue | Jon Leighton | 2012-09-15 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | Fix test | Jon Leighton | 2012-09-15 | 2 | -15/+21 | |
* | | | Ensure disconnecting or reconnecting resets the transaction state | Jon Leighton | 2012-09-15 | 7 | -9/+55 | |
* | | | Remove our use of #outside_transaction? | Jon Leighton | 2012-09-15 | 3 | -61/+17 | |
* | | | Remove the transaction_open variable | Jon Leighton | 2012-09-15 | 2 | -21/+33 | |
* | | | Move transaction joinability into the transaction object | Jon Leighton | 2012-09-15 | 5 | -20/+36 | |
* | | | Alter the naming structure a bit | Jon Leighton | 2012-09-15 | 3 | -108/+111 | |
* | | | Split Open into Real and Savepoint | Jon Leighton | 2012-09-15 | 1 | -25/+38 | |
* | | | DRY | Jon Leighton | 2012-09-15 | 1 | -4/+8 | |
* | | | Don't do the rollback in #commit | Jon Leighton | 2012-09-15 | 2 | -18/+7 |