Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add comment about implementation of class_attribute | Andrew White | 2012-12-06 | 1 | -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 Noria | 2012-12-06 | 1 | -0/+3 |
| | |||||
* | Merge pull request #8431 from joshsusser/schemadump | Aaron Patterson | 2012-12-05 | 1 | -4/+2 |
|\ | | | | | dump schema.rb without :version option | ||||
| * | dump schema.rb without :version option | Josh Susser | 2012-12-05 | 1 | -4/+2 |
|/ | |||||
* | Merge branch 'joshsusser-master' into merge | Aaron Patterson | 2012-12-05 | 15 | -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 cleanup | Josh Susser | 2012-12-03 | 3 | -6/+5 |
| | | |||||
| * | Add migration history to schema.rb dump | Josh Susser | 2012-12-02 | 9 | -17/+146 |
| | | |||||
| * | Add metadata to schema_migrations | Josh Susser | 2012-12-01 | 10 | -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-order | Carlos Antonio da Silva | 2012-12-05 | 1 | -3/+1 |
|\ \ | | | | | | | Revert turbolinks load order requirement | ||||
| * | | Revert turbolinks load order requirement | Nick Reed | 2012-12-05 | 1 | -3/+1 |
|/ / | |||||
* | | Fix duplicated method name | Carlos Antonio da Silva | 2012-12-05 | 1 | -2/+1 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #8427 from kennyj/support_rack_env | Rafael Mendonça França | 2012-12-05 | 7 | -5/+67 |
|\ \ | | | | | | | Add ENV['RACK_ENV'] support to rake runner/console/server. | ||||
| * | | Add ENV['RACK_ENV'] support to rake runner/console/server. | kennyj | 2012-12-06 | 7 | -5/+67 |
|/ / | |||||
* | | Merge pull request #8424 from kennyj/tiny_fixes_20121206 | Xavier Noria | 2012-12-05 | 1 | -3/+7 |
|\ \ | | | | | | | fix warning: possibly useless use of a constant in void context | ||||
| * | | silence warning: possibly useless use of a constant in void context | kennyj | 2012-12-06 | 1 | -3/+7 |
|/ / | |||||
* | | Merge pull request #8371 from freegenie/5396-conditional-fragment-caching | Rafael Mendonça França | 2012-12-05 | 3 | -1/+83 |
|\ \ | | | | | | | | | | | | | Allow fragment cache to accept :if and :unless options. Closes #5396 | ||||
| * | | Allow fragment cache to accept :if and :unless options | Fabrizio Regini | 2012-12-05 | 3 | -1/+83 |
| | | | | | | | | | | | | [Stephen Ausman + Fabrizio Regini] | ||||
* | | | Merge pull request #8412 from ↵ | Rafael Mendonça França | 2012-12-05 | 1 | -18/+14 |
|\ \ \ | |/ / |/| | | | | | | | | JoeyButler/action_dispatch_routing_mapper_refactoring Extract method refactoring. | ||||
| * | | Extract method refactoring in ActionDispatch::Routing::SingletonResource. | Joey Butler | 2012-12-05 | 1 | -18/+14 |
| | | | |||||
* | | | Merge pull request #8404 from freegenie/filter_redirects | Andrew White | 2012-12-05 | 9 | -5/+96 |
|\ \ \ | |||||
| * | | | Adding filter capability to ActionController logs | Fabrizio Regini | 2012-12-05 | 9 | -5/+96 |
| | | | | |||||
* | | | | Merge pull request #8421 from claudiob/remove_unicode_blanks | Carlos Antonio da Silva | 2012-12-05 | 27 | -49/+49 |
|\ \ \ \ | |/ / / |/| | | | Replace comments' non-breaking spaces with spaces [ci skip] | ||||
| * | | | Replace comments' non-breaking spaces with spaces | claudiob | 2012-12-04 | 27 | -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 guides | Carlos Antonio da Silva | 2012-12-04 | 4 | -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 Silva | 2012-12-04 | 1 | -33/+27 |
| | | | |||||
* | | | Merge pull request #8418 from ershad/master | Carlos Antonio da Silva | 2012-12-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixing a spelling mistake [ci skip] | ||||
| * | | | Fixing a couple of spelling mistakes | Ershad K | 2012-12-04 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #8417 from kennyj/fix_8414 | Rafael Mendonça França | 2012-12-04 | 2 | -3/+8 |
|\ \ \ | | | | | | | | | Fix #8414. Performance problem with postgresql adapter primary_key function. | ||||
| * | | | Fix #8414. Performance problem with postgresql adapter primary_key function. | kennyj | 2012-12-05 | 2 | -3/+8 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-04 | 39 | -392/+435 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/migrations.md | ||||
| * | | | | copy edits [ci skip] | Vijay Dev | 2012-12-04 | 4 | -27/+18 |
| | | | | | |||||
| * | | | | Revert "Add documentation to TransactionIsolationError [ci skip]" | Vijay Dev | 2012-12-04 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ff59704f68d284381606a1b76e4ffcfd73b2cfa. Reason: Seems dubious and adds less value. [ci skip] | ||||
| * | | | | Fix a typo in ActionController::Caching | Jean Boussier | 2012-12-03 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | fix some formatting | 1334 | 2012-12-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix typo. | Hendy Tanata | 2012-12-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | grammar improvements for increment_counter and decrement_counter docs | Matthew Robertson | 2012-12-02 | 1 | -6/+8 |
| | | | | | |||||
| * | | | | increment_counter and decrement_counter can accept and array of ids as an arg | Matthew Robertson | 2012-12-02 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | added full file path in all file references | Yoni Yalovitsky | 2012-12-03 | 1 | -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' dir | Yoni Yalovitsky | 2012-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Standardize use of "route globbing" and "wildcard segments" [ci skip] | Pablo Torres | 2012-12-02 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Add counterexample for regex [ci skip] | Pablo Torres | 2012-12-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Convert parragraph about security to a NOTE [ci skip] | Pablo Torres | 2012-12-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add clarity to static segments docs in non-resourceful routes [ci skip] | Pablo Torres | 2012-12-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Correct grammar [ci skip] | Pablo Torres | 2012-12-02 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Convert a section to a tip to highlight it [ci skip] | Pablo Torres | 2012-12-02 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Normalize use of colon before code examples in routing guide [ci skip] | Pablo Torres | 2012-12-02 | 1 | -32/+32 |
| | | | | | |||||
| * | | | | Show equivalent routes definition without using concerns [ci skip] | Pablo Torres | 2012-12-02 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | Clarify section titles [ci skip] | Pablo Torres | 2012-12-02 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Move note to a meaningful section in the guides [ci skip] | Pablo Torres | 2012-12-02 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Use correct conjunction and connector words [ci skip] | Pablo Torres | 2012-12-02 | 1 | -3/+5 |
| | | | | |