aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-2112-28/+71
|\
| * Revert "add a missing "on" and remove the "endprologue" text"Vijay Dev2011-09-211-1/+3
| * indentation fixesVijay Dev2011-09-211-2/+2
| * add a missing "on" and remove the "endprologue" textWaynn Lue2011-09-211-3/+1
| * add a '.' to etcWaynn Lue2011-09-211-1/+1
| * add "the" to mirror the structure of the other two pointsWaynn Lue2011-09-211-1/+1
| * copy edits 302e5707Vijay Dev2011-09-201-4/+3
| * remove unnecessary markupVijay Dev2011-09-201-6/+6
| * Locale code for Czech is ":cs"Jan Vlnas2011-09-181-1/+1
| * sass-rails helpers - hyphenated in Sass, underscored in Ruby.Uģis Ozols2011-09-171-5/+5
| * Fixing incorrect notextile tagsVijay Dev2011-09-169-24/+26
| * minor editVijay Dev2011-09-161-1/+1
| * "Passing variables into the translation" section addedKir Shatrov2011-09-161-0/+14
| * Add reference about --skip-sprockets to Asset Pipeline GuideGuillermo Iguaran2011-09-151-0/+6
| * update guides, use html safe translations in i18nAlexey Vakhov2011-09-152-0/+22
* | config.action_controller.asset_host shouldn't set to nil during precompileGuillermo Iguaran2011-09-151-14/+0
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-1529-232/+37
|\
| * No more changelogs inside guidesVijay Dev2011-09-1527-211/+0
| * Mention that old fixes are to be done on 3-0-stableVijay Dev2011-09-141-3/+3
| * change first_or_new to first_or_initialize as per 11870117, and some editsVijay Dev2011-09-141-10/+12
| * forgot to sign my name to the ChangelogDallas Reedy2011-09-141-1/+1
| * Removed mention of deprecated proxy methods in favor of using proxy_association.Dallas Reedy2011-09-141-4/+5
| * remove info about guides hackfestVijay Dev2011-09-141-1/+0
| * Add equivalent nginx configurationBen Walding2011-09-141-1/+15
| * Fix typos and broken link on asset pipeline guideJaime Iniesta2011-09-141-3/+3
* | update 3.1 release date in changelogsVijay Dev2011-09-141-1/+1
* | Revert "Provide a way to access to assets without using the digest, useful fo...Santiago Pastorino2011-09-142-5/+0
* | Fix broken asset testGuillermo Iguaran2011-09-131-2/+2
* | Don't mount Sprockets at config.assets.prefix if config.assets.compile is false.Mark J. Titorenko2011-09-131-0/+12
* | Provide a way to access to assets without using the digest, useful for static...Santiago Pastorino2011-09-132-0/+5
* | delete stray backup files from guides sample appVijay Dev2011-09-132-62/+0
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-136-82/+14
|\
| * Fixed markup error.45north2011-09-131-1/+1
| * Fix typoMike Gunderloy2011-09-131-1/+1
| * getting_started.textile: Fix typo and split up a sentence in section "Buildin...dharmatech2011-09-121-2/+2
| * Merge pull request #67 from alanzeino/masterVijay Dev2011-09-121-2/+2
| |\
| | * Slight change to reflect current 'destroy' code generated by scaffold in 3.1 ...Alan Zeino2011-09-121-2/+2
| * | Delete contribute.textile now that its contents are merged to the contributin...Vijay Dev2011-09-121-70/+0
| * | change GH issue tracker urlVijay Dev2011-09-121-1/+1
| * | getting_started.textile: Fix typos in section "Rendering a Partial Form"dharmatech2011-09-121-1/+1
| |/
| * merged the contribution guides and changed theVijay Dev2011-09-112-5/+7
* | Fix precompile asset_host testGuillermo Iguaran2011-09-131-1/+1
* | Move asset tests to assets_test fileGuillermo Iguaran2011-09-132-31/+31
* | fixed the failing generators_testDeepak Prasanna2011-09-131-1/+1
* | Merge pull request #2987 from kennyj/masterSantiago Pastorino2011-09-121-0/+16
|\ \
| * | fix https://github.com/rails/rails/issues/2947 (with testcase)kennyj2011-09-131-0/+16
* | | point rails at Journey for dev and edgeAaron Patterson2011-09-122-0/+3
* | | adjust route inspection to work with JourneyAaron Patterson2011-09-121-1/+2
* | | Use the proper executable on tests.José Valim2011-09-121-1/+1
* | | Merge pull request #2985 from kennyj/masterSantiago Pastorino2011-09-121-0/+16
|\| |