aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | Standardize use of "route globbing" and "wildcard segments" [ci skip]Pablo Torres2012-12-021-3/+3
| | | |
| * | | Add counterexample for regex [ci skip]Pablo Torres2012-12-021-1/+1
| | | |
| * | | Convert parragraph about security to a NOTE [ci skip]Pablo Torres2012-12-021-1/+1
| | | |
| * | | Add clarity to static segments docs in non-resourceful routes [ci skip]Pablo Torres2012-12-021-1/+1
| | | |
| * | | Correct grammar [ci skip]Pablo Torres2012-12-021-3/+3
| | | |
| * | | Convert a section to a tip to highlight it [ci skip]Pablo Torres2012-12-021-3/+1
| | | |
| * | | Normalize use of colon before code examples in routing guide [ci skip]Pablo Torres2012-12-021-32/+32
| | | |
| * | | Show equivalent routes definition without using concerns [ci skip]Pablo Torres2012-12-021-0/+13
| | | |
| * | | Clarify section titles [ci skip]Pablo Torres2012-12-021-2/+2
| | | |
| * | | Move note to a meaningful section in the guides [ci skip]Pablo Torres2012-12-021-2/+2
| | | |
| * | | Use correct conjunction and connector words [ci skip]Pablo Torres2012-12-021-3/+5
| | | |
| * | | match text with translation file exampleChris Walquist2012-12-021-1/+1
| | | |
| * | | Capitalize all table column titles in routing guidePablo Torres2012-12-021-8/+8
| | | |
| * | | List instructions in the order to be executedPablo Torres2012-12-021-3/+1
| | | |
| * | | Add shallow nesting to the routing guidePablo Torres2012-12-021-0/+85
| | | |
| * | | Remove nodoc from FlashHash #[]= [ci skip]Pablo Torres2012-12-011-1/+1
| | | |
| * | | Cleans and removes 'Examples' tag [ci skip]Alvaro Pereyra2012-12-016-13/+4
| | | |
| * | | Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-018-71/+46
| | | |
| * | | nodoc AS::Testing::ConstantLookup::ClassMethods [ci skip]Carlos Duclos2012-12-011-1/+1
| | | |
| * | | Add documentation for Hash.from_xml [ci skip]HPNeo2012-12-011-0/+13
| | | |