aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use Ruby 1.9 Hash syntax in railtiesRobin Dupret2012-10-1494-447/+447
* Merge pull request #7937 from arturopie/7914-defaults-on-domains-and-multiple...Rafael Mendonça França2012-10-136-15/+61
|\
| * #7914 Remove code for unsupported postgreSQL version.Arturo Pie2012-10-132-6/+0
| * #7914 Using a better way to get the defaults from db.Arturo Pie2012-10-132-6/+7
| * #7914 Add change of previous commit to CHANGELOG.mdArturo Pie2012-10-131-0/+4
| * #7914 get default value when type uses schema nameArturo Pie2012-10-134-3/+50
|/
* Merge pull request #7935 from leereilly/minor-gemfile-twerkRafael Mendonça França2012-10-131-1/+1
|\
| * Replace double quotes with single quotesLee Reilly2012-10-131-1/+1
|/
* Test that a Rails.queue consumer is automatically started in productionJeremy Kemper2012-10-133-3/+14
* Backpedal from class-oriented config.queue. Set an actual queue instance.Jeremy Kemper2012-10-1210-26/+14
* Tighten up asset precompile testsJeremy Kemper2012-10-122-4/+3
* Remove the queue container. Premature consolidation. Set up and maintain queu...Jeremy Kemper2012-10-125-68/+9
* Merge pull request #7891 from schneems/schneems/rake_command_warningJosé Valim2012-10-121-23/+32
|\
| * Prompt to run rake when accidentally typed railsschneems2012-10-121-23/+32
* | performance improvements to joins!Aaron Patterson2012-10-122-5/+13
* | Speed up relation merging by reducing calls to Array#-Aaron Patterson2012-10-121-3/+5
* | Merge pull request #7007 from Mik-die/hash_extractRafael Mendonça França2012-10-124-6/+49
|\ \
| * | add more testcases and doc about Hash#extract!Mikhail Dieterle2012-10-083-6/+21
| * | make Hash#extract! more symmetric with Hash#sliceMikhail Dieterle2012-10-083-3/+31
* | | Merge pull request #7926 from senny/whitespace_cleanupRafael Mendonça França2012-10-121-12/+12
|\ \ \
| * | | trailling whitespace cleanup in query_methods.rbYves Senn2012-10-121-12/+12
* | | | Merge pull request #7923 from josh/seperate-asset-tag-and-url-concernsRafael Mendonça França2012-10-125-419/+416
|\ \ \ \ | |/ / / |/| | |
| * | | Split asset url helpers into seperate AssetUrlHelperJoshua Peek2012-10-125-419/+416
|/ / /
* | | ActiveSupport::SynchronousQueue doesn't have the drain method.Rafael Mendonça França2012-10-121-4/+4
* | | Move the TestQueue tests to the proper fileRafael Mendonça França2012-10-122-47/+44
* | | Merge pull request #7871 from bjnord/masterRafael Mendonça França2012-10-123-8/+12
|\ \ \
| * | | Add .rake to `rake notes` and `rake notes:custom`Brent J. Nordquist2012-10-123-8/+12
* | | | Merge pull request #7913 from mje113/masterXavier Noria2012-10-121-0/+4
|\ \ \ \
| * | | | Padding expires_in by 5 minutes on dalli key write to facilitate :race_condit...Mike Evans2012-10-111-0/+4
* | | | | Merge pull request #7919 from arunagw/warning_removed_shadowingRafael Mendonça França2012-10-121-2/+2
|\ \ \ \ \
| * | | | | warning removed: shadowing outer local variable - valueArun Agrawal2012-10-121-2/+2
* | | | | | Merge pull request #7765 from insside/clever-orderJon Leighton2012-10-123-4/+73
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | learn ActiveRecord::QueryMethods#order work with hash argumentsTima Maslyuchenko2012-10-123-4/+73
|/ / / / /
* / / / / Immediately run queued jobs in tests. Otherwise you have to explicitly drain ...Jeremy Kemper2012-10-122-5/+5
|/ / / /
* | | | Don't allocate new strings in compiled attribute methodsJon Leighton2012-10-122-20/+39
* | | | Revert "Key the attributes hash with symbols"Jon Leighton2012-10-124-14/+10
* | | | Merge pull request #7917 from dfens/masterJosé Valim2012-10-128-8/+8
|\ \ \ \
| * | | | Cleanup trailing whitespacesdfens2012-10-128-8/+8
|/ / / /
* | | | Merge pull request #7915 from frodsan/docs_permitRafael Mendonça França2012-10-111-0/+22
|\ \ \ \
| * | | | update AC::Parameters#permit documentation [ci skip]Francesco Rodriguez2012-10-111-0/+22
|/ / / /
* | | | When executing permit with just a key that points to a hash, DO NOT allow all...Santiago Pastorino2012-10-122-2/+9
* | | | adding a test for b21f24d9807bd161af947cf0f0cc440c9adffb73Aaron Patterson2012-10-111-0/+14
* | | | Merge pull request #7912 from mrship/masterRafael Mendonça França2012-10-114-1/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Allow for deep directory path for view templates.Andy Shipman2012-10-114-1/+8
|/ / /
* | | Merge pull request #7886 from senny/3675_assert_template_twice_against_same_p...Rafael Mendonça França2012-10-115-13/+50
|\ \ \
| * | | refactor `ActionView::TestCase` internals to track rendered localsYves Senn2012-10-112-20/+33
| * | | recognizes when a partial was rendered twice. Closes #3675Yves Senn2012-10-115-9/+33
* | | | Merge pull request #7908 from arunagw/build_fix_railtiesRafael Mendonça França2012-10-111-5/+0
|\ \ \ \ | |/ / / |/| | |
| * | | No need to test for rack-cache present in GemfileArun Agrawal2012-10-111-5/+0
|/ / /
* | | Merge pull request #7050 from kytrinyx/documentation-reset-column-infoVijay Dev2012-10-101-0/+21
|\ \ \