aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3374 from marcbowes/masterJosé Valim2011-10-201-1/+1
|\
| * Remove the unneeded `\d` when sanitizing `X-Request-Id`.Marc Bowes2011-10-201-1/+1
|/
* Don't use :path in Gemfile for --dev except for Rails.José Valim2011-10-202-3/+1
* Fix the proper production.rbDavid Heinemeier Hansson2011-10-191-1/+4
* Encourage use of tagged logging even when using a different loggerDavid Heinemeier Hansson2011-10-191-1/+1
* Unify logger and taggedlogging middleware as both address logging concerns.José Valim2011-10-195-52/+28
* Ensure TaggegLogging is thread safe.José Valim2011-10-192-14/+51
* Load object/blank and make use of presence.José Valim2011-10-191-2/+3
* Make tests run on 1.8.x, add integration setup.José Valim2011-10-192-42/+47
* Programatically define the log level methods and use the Logger constants ins...David Heinemeier Hansson2011-10-191-23/+8
* Merge pull request #3369 from martinsvalin/am_errors_addedJosé Valim2011-10-193-7/+68
|\
| * New #added? method on ActiveModel::ErrorsMartin Svalin2011-10-193-7/+68
* | Blah, SecureRandom#uuid is not supported in 1.8.7 -- cant wait for Rails 4.0 ...David Heinemeier Hansson2011-10-192-2/+2
* | Require missing string access dependency.José Valim2011-10-191-0/+1
* | Require securerandom as it is the proper dependency.José Valim2011-10-191-1/+1
* | Simplify TaggedLogging symbol shortcuts (thanks Jose!)David Heinemeier Hansson2011-10-191-7/+4
* | Added X-Request-Id tracking and TaggedLogging to easily log that and other pr...David Heinemeier Hansson2011-10-1917-5/+272
* | Use toplevel Rack::ContentLengthJeremy Kemper2011-10-191-1/+1
|/
* Merge pull request #3362 from avakhov/p-superfluous-assign-cookiesVijay Dev2011-10-191-1/+1
|\
| * Remove superfluous assignment in cookiesAlexey Vakhov2011-10-181-1/+1
* | only use now() on pg!Aaron Patterson2011-10-181-1/+3
|/
* reset prepared statement when schema changes imapact statement results. fixes...Aaron Patterson2011-10-182-11/+51
* Use again Rack's ContentLength middleware part 2Santiago Pastorino2011-10-181-0/+1
* Use again Rack's ContentLength middlewareSantiago Pastorino2011-10-183-40/+0
* Merge pull request #3350 from whilefalse/rake_environment_in_enginesJosé Valim2011-10-182-0/+18
|\
| * Added test for rake environment in an enginesteve2011-10-181-0/+17
| * Added environment rake task to enginesSteven Anderson2011-10-181-0/+1
* | use now() for dates in pgAaron Patterson2011-10-181-1/+1
|/
* Merge pull request #3356 from arunagw/bunp_rackJosé Valim2011-10-171-1/+1
|\
| * Bump Rack to 1.3.5Arun Agrawal2011-10-181-1/+1
|/
* Merge pull request #3340 from surfacedamage/exclude_destroy_in_all_blank_checkJosé Valim2011-10-173-2/+16
|\
| * Exclude _destroy parameter in :all_blank check (issue #2937)Aaron Christy2011-10-173-2/+16
* | Merge pull request #3151 from zenprogrammer/pluralize_without_countJosé Valim2011-10-173-7/+30
|\ \
| * | Modified String#pluralize to take an optional count parameter.Ryan Oblak2011-09-283-7/+30
* | | use variables from test setupVijay Dev2011-10-171-6/+4
* | | fix a typo and slightly reword has_secure_password commentVijay Dev2011-10-171-2/+2
* | | Merge pull request #3319 from martinsvalin/active_model_errors_fixesJosé Valim2011-10-172-4/+29
|\ \ \
| * | | ActiveModel::Errors#generate_message without i18n_scope, and more test cases ...Martin Svalin2011-10-172-4/+29
|/ / /
* | | Merge pull request #3334 from mperham/masterAaron Patterson2011-10-163-8/+8
|\ \ \
| * | | Default timestamps to non-nullMike Perham2011-10-143-8/+8
* | | | Merge pull request #3343 from vatrai/fix_warningVijay Dev2011-10-161-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix to remove warning in test casesVishnu Atrai2011-10-161-2/+2
|/ / /
* | | Merge pull request #3320 from sunaku/space-alignJosé Valim2011-10-151-6/+6
|\ \ \ | |/ / |/| |
| * | fix inconsistent alignment in Gemfile generatorSuraj N. Kurapati2011-10-131-6/+6
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-1413-89/+206
|\ \ \
| * \ \ Merge pull request #72 from pote/masterVijay Dev2011-10-141-1/+1
| |\ \ \
| | * | | security reasonS should be pluralPoTe2011-10-131-1/+1
| * | | | [engines guide] WIP for explaining how to hook engine into applicationRyan Bigg2011-10-141-0/+46
| * | | | [engines guide] complete comments resource generationRyan Bigg2011-10-141-0/+65
| * | | | [engines guide] Add heading for commentsRyan Bigg2011-10-141-0/+1