aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove method redefined warningsCarlos Antonio da Silva2012-12-061-1/+1
|
* Use CURRENT_TIMESTAMP since it has apparently better cross db supportCarlos Antonio da Silva2012-12-062-2/+2
| | | | | LOCALTIMESTAMP is not support by sqlite3, and travis was giving us these errors: https://travis-ci.org/rails/rails/jobs/3535241/#L570
* Run rake tasks all at once in rake dbs test for a speed upCarlos Antonio da Silva2012-12-061-12/+6
| | | | | | | | | | | Before: Finished tests in 56.245787s, 0.2133 tests/s, 0.0000 assertions/s. 12 tests, 0 assertions, 0 failures, 0 errors, 0 skips After: Finished tests in 42.401416s, 0.2830 tests/s, 0.0000 assertions/s. 12 tests, 0 assertions, 0 failures, 0 errors, 0 skips
* Merge pull request #8440 from steveklabnik/masterRafael Mendonça França2012-12-061-0/+3
|\ | | | | | | | | CHANGELOG for 78d5d6f [ci skip]
| * CHANGELOG for 78d5d6f.Steve Klabnik2012-12-061-0/+3
|/ | | | | It was pointed out by @giner that the CHANGELOG entry for https://github.com/rails/rails/commit/78d5d6f8688bb7c45ba9a3ef893682231130da3f wasn't included. Here it is.
* Merge pull request #8439 from joshsusser/fixesCarlos Antonio da Silva2012-12-063-5/+5
|\ | | | | Fixes issues in test_mysql2
| * Oracle needs table to check index existenceJosh Susser2012-12-061-3/+3
| |
| * convert time to stringJosh Susser2012-12-062-2/+2
| | | | | | why is this a Time to start with?
* | Change the encrypted campfire notification tokenRafael Mendonça França2012-12-061-1/+1
| |
* | Invert precedence of content in ActionDispatch::StaticAndrew White2012-12-064-12/+51
|/ | | | | | | | | | This commit inverts the precedence in ActionDispatch::Static so that dynamic content will be served before static content. This is so that precompiled assets do not inadvertently get included when running in development mode - it should have no effect in production where static files are usually handled by the web server. Closes #6421
* Refactor tests that switch RAILS_ENV and RACK_ENVCarlos Antonio da Silva2012-12-066-63/+63
| | | | | | | | | | | | This cleanup aims to fix a build failure: https://travis-ci.org/rails/rails/jobs/3515951/#L482 Since travis always have both ENV vars set to "test", a test is failing where it's expected to output the default env "development", but "test" is the result due to RACK_ENV being set when we expect it to not be. By cleaning this duplication we ensure that changing any of these env variables will pick the right expected value.
* Add comment about implementation of class_attributeAndrew White2012-12-061-0/+3
| | | | | | | To prevent future pull requests like #8435 add a comment about the implementation of class_attribute using class_eval for performance. [ci skip]
* adds a couple of items to the check list for stable releases [ci skip]Xavier Noria2012-12-061-0/+3
|
* Merge pull request #8431 from joshsusser/schemadumpAaron Patterson2012-12-051-4/+2
|\ | | | | dump schema.rb without :version option
| * dump schema.rb without :version optionJosh Susser2012-12-051-4/+2
|/
* Merge branch 'joshsusser-master' into mergeAaron Patterson2012-12-0515-58/+268
|\ | | | | | | | | | | | | | | | | | | | | * joshsusser-master: style cleanup Add migration history to schema.rb dump Add metadata to schema_migrations Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/schema.rb
| * style cleanupJosh Susser2012-12-033-6/+5
| |
| * Add migration history to schema.rb dumpJosh Susser2012-12-029-17/+146
| |
| * Add metadata to schema_migrationsJosh Susser2012-12-0110-43/+125
| | | | | | | | | | migrated_at: timestamp when migration run fingerprint: md5 hash of migration source name: filename without version or extension
* | Merge pull request #8429 from reednj77/turbolinks-js-include-orderCarlos Antonio da Silva2012-12-051-3/+1
|\ \ | | | | | | Revert turbolinks load order requirement
| * | Revert turbolinks load order requirementNick Reed2012-12-051-3/+1
|/ /
* | Fix duplicated method nameCarlos Antonio da Silva2012-12-051-2/+1
| | | | | | | | [ci skip]
* | Merge pull request #8427 from kennyj/support_rack_envRafael Mendonça França2012-12-057-5/+67
|\ \ | | | | | | Add ENV['RACK_ENV'] support to rake runner/console/server.
| * | Add ENV['RACK_ENV'] support to rake runner/console/server.kennyj2012-12-067-5/+67
|/ /
* | Merge pull request #8424 from kennyj/tiny_fixes_20121206Xavier Noria2012-12-051-3/+7
|\ \ | | | | | | fix warning: possibly useless use of a constant in void context
| * | silence warning: possibly useless use of a constant in void contextkennyj2012-12-061-3/+7
|/ /
* | Merge pull request #8371 from freegenie/5396-conditional-fragment-cachingRafael Mendonça França2012-12-053-1/+83
|\ \ | | | | | | | | | | | | Allow fragment cache to accept :if and :unless options. Closes #5396
| * | Allow fragment cache to accept :if and :unless optionsFabrizio Regini2012-12-053-1/+83
| | | | | | | | | | | | [Stephen Ausman + Fabrizio Regini]
* | | Merge pull request #8412 from ↵Rafael Mendonça França2012-12-051-18/+14
|\ \ \ | |/ / |/| | | | | | | | JoeyButler/action_dispatch_routing_mapper_refactoring Extract method refactoring.
| * | Extract method refactoring in ActionDispatch::Routing::SingletonResource.Joey Butler2012-12-051-18/+14
| | |
* | | Merge pull request #8404 from freegenie/filter_redirectsAndrew White2012-12-059-5/+96
|\ \ \
| * | | Adding filter capability to ActionController logsFabrizio Regini2012-12-059-5/+96
| | | |
* | | | Merge pull request #8421 from claudiob/remove_unicode_blanksCarlos Antonio da Silva2012-12-0527-49/+49
|\ \ \ \ | |/ / / |/| | | Replace comments' non-breaking spaces with spaces [ci skip]
| * | | Replace comments' non-breaking spaces with spacesclaudiob2012-12-0427-49/+49
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code.
* | | Fix Active Record validation error messages markup in guidesCarlos Antonio da Silva2012-12-044-61/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The other way it was not marking the text as italic, it was showing the underlines as normal text. Also fixes some code examples indentation and # => marks in Active Model and Active Record guides. [ci skip]
* | | Improve the Active Model guide [ci skip]Carlos Antonio da Silva2012-12-041-33/+27
| | |
* | | Merge pull request #8418 from ershad/masterCarlos Antonio da Silva2012-12-041-1/+1
|\ \ \ | | | | | | | | Fixing a spelling mistake [ci skip]
| * | | Fixing a couple of spelling mistakesErshad K2012-12-041-1/+1
|/ / /
* | | Merge pull request #8417 from kennyj/fix_8414Rafael Mendonça França2012-12-042-3/+8
|\ \ \ | | | | | | | | Fix #8414. Performance problem with postgresql adapter primary_key function.
| * | | Fix #8414. Performance problem with postgresql adapter primary_key function.kennyj2012-12-052-3/+8
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0439-392/+435
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/migrations.md
| * | | | copy edits [ci skip]Vijay Dev2012-12-044-27/+18
| | | | |
| * | | | Revert "Add documentation to TransactionIsolationError [ci skip]"Vijay Dev2012-12-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ff59704f68d284381606a1b76e4ffcfd73b2cfa. Reason: Seems dubious and adds less value. [ci skip]
| * | | | Fix a typo in ActionController::CachingJean Boussier2012-12-031-2/+1
| | | | |
| * | | | fix some formatting13342012-12-031-2/+2
| | | | |
| * | | | Fix typo.Hendy Tanata2012-12-031-2/+2
| | | | |
| * | | | grammar improvements for increment_counter and decrement_counter docsMatthew Robertson2012-12-021-6/+8
| | | | |
| * | | | increment_counter and decrement_counter can accept and array of ids as an argMatthew Robertson2012-12-021-2/+2
| | | | |
| * | | | added full file path in all file referencesYoni Yalovitsky2012-12-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | It's really comfy being able to copy-paste the file paths. I suppose there's also some benefit in trying to figure out the file name as a small exercise, but I don't think that sort of thing belongs in "Getting Started".
| * | | | removed an extra slash before the 'app' dirYoni Yalovitsky2012-12-031-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 16:53:00 +0000