aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move asset debugging tests into a separate test caseDaniel Schierbeck2011-08-252-42/+56
* fix ambiguous * and remove unused variableAaron Patterson2011-08-241-2/+2
* fix ambiguous use of *Aaron Patterson2011-08-241-1/+1
* stop circular require warningsAaron Patterson2011-08-243-3/+0
* only backport the to_d method if it does not existAaron Patterson2011-08-241-2/+5
* only define the encoding reader since we define the writer later onAaron Patterson2011-08-241-1/+2
* we are *sure* we want to set the encoding, so silence warnings around itAaron Patterson2011-08-242-4/+9
* Merge pull request #2679 from amatsuda/nullify_abstract_class_table_nameAaron Patterson2011-08-242-0/+6
|\
| * do not compute table names for abstract classesAkira Matsuda2011-08-242-0/+6
* | the command line guide is good to goXavier Noria2011-08-241-1/+1
* | Merge pull request #2674 from masterkain/masterJon Leighton2011-08-241-0/+1
|\ \
| * | Adding missing autoloadClaudio Poli2011-08-241-0/+1
* | | Merge pull request #2677 from guilleiguaran/refactor-sprockets-helpersSantiago Pastorino2011-08-241-19/+6
|\ \ \
| * | | Preserve stylesheet_link_tag and javascript_include_tag options on debugGuillermo Iguaran2011-08-241-4/+3
| * | | Use super in javascript_include_tag and stylesheet_link_tag instead of genera...Guillermo Iguaran2011-08-241-14/+2
| * | | Remove redundant join and call to html_safeGuillermo Iguaran2011-08-241-2/+2
| |/ /
* | | bumping bcrypt-ruby requirementAaron Patterson2011-08-241-1/+1
* | | dealing with some -w warnings on startupAaron Patterson2011-08-245-2/+11
* | | Merge pull request #2675 from jdelStrother/load_once_pathnames_fixJosé Valim2011-08-242-1/+20
|\ \ \ | |/ / |/| |
| * | Fix autoload_once_paths when using Pathnames & ruby 1.9Jonathan del Strother2011-08-242-1/+20
* | | Revert "Simplify JavaScriptHelper#escape_javascript"Santiago Pastorino2011-08-241-4/+6
* | | Bring in sprockets precompile taskJoshua Peek2011-08-241-3/+26
|/ /
* | Merge pull request #2644 from guilleiguaran/allow-assets-debuggingSantiago Pastorino2011-08-246-9/+61
|\ \
| * | Add config.allow_debugging option to determine if the debug_assets query para...Guillermo Iguaran2011-08-246-9/+61
* | | Merge pull request #2668 from guilleiguaran/debug-assets-media-typeSantiago Pastorino2011-08-242-2/+6
|\ \ \ | |/ / |/| |
| * | Debug assets shouldn't ignore media type for stylesheets. Closes #2625Guillermo Iguaran2011-08-232-2/+6
* | | Merge pull request #2390 from arunagw/test_for_environment_fileSantiago Pastorino2011-08-241-0/+9
|\ \ \
| * | | Test added to check mass_assignment_sanitizer is not present if --skip-active...Arun Agrawal2011-08-031-0/+9
* | | | Merge pull request #2647 from dmathieu/no_rescueSantiago Pastorino2011-08-242-7/+8
|\ \ \ \
| * | | | remove useless rescueDamien Mathieu2011-08-242-7/+8
* | | | | Merge pull request #2669 from BMorearty/remove-extra-wordSantiago Pastorino2011-08-241-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove extra word from sentence in initialization guide.Brian Morearty2011-08-231-1/+1
| | |_|/ | |/| |
* / | | Simplify JavaScriptHelper#escape_javascriptDaniel Schierbeck2011-08-241-7/+6
|/ / /
* | | `load` should also return the value from `super`Aaron Patterson2011-08-231-1/+3
* | | require needs to return true or false. thank you Ryan "zenspider" DavisAaron Patterson2011-08-231-1/+3
* | | Merge pull request #2607 from guilleiguaran/add-rbenv-gitignoreDavid Heinemeier Hansson2011-08-231-0/+1
|\ \ \
| * | | Add .rbenv-version to .gitignoreGuillermo Iguaran2011-08-201-0/+1
* | | | Make ActionController::TestCase#recycle! set @protocol to nilDavid Majda2011-08-231-1/+1
* | | | Add failing test case for #2654Andrew White2011-08-231-0/+17
* | | | Ensure regexp and hash key are UTF-8Andrew White2011-08-232-4/+16
* | | | Merge pull request #2616 from tilsammans/patch-2Xavier Noria2011-08-231-1/+1
|\ \ \ \
| * | | | removed the link to my blog to help stop endless commentsJoost Baaij2011-08-231-1/+1
| * | | | Revert "Removed my name from the changelog as the amount of blogspam became r...Joost Baaij2011-08-231-0/+1
| * | | | Removed my name from the changelog as the amount of blogspam became ridiculous. Joost Baaij2011-08-221-1/+0
* | | | | Merge pull request #2653 from luckydev/ser-wrapXavier Noria2011-08-231-0/+2
|\ \ \ \ \
| * | | | | added missing require array/wrap in serializationAnand2011-08-231-0/+2
* | | | | | Merge pull request #2652 from dasch/remove-trailing-whitespaceXavier Noria2011-08-231-2/+2
|\ \ \ \ \ \
| * | | | | | Remove trailing whitespaceDaniel Schierbeck2011-08-231-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2651 from luckydev/serialization-testsJosé Valim2011-08-231-1/+14
|\ \ \ \ \ \
| * | | | | | added more tests for only-include and except-include options in serializationAnand2011-08-231-1/+14
| | |/ / / / | |/| | | |