aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #2675 from jdelStrother/load_once_pathnames_fixJosé Valim2011-08-242-1/+20
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Fix autoload_once_paths when using Pathnames & ruby 1.9
| * | | | | | | | | | Fix autoload_once_paths when using Pathnames & ruby 1.9Jonathan del Strother2011-08-242-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under ruby 1.9.2 - "/var/log".starts_with?(Pathname.new("/var")) # => false so setting config.autoload_once_paths with Pathnames would not work
* | | | | | | | | | | Revert "Simplify JavaScriptHelper#escape_javascript"Santiago Pastorino2011-08-241-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit broke the build without any improvement. This reverts commit eb0b71478ad4c37fdc4ec77bf2cf7c6b65dd36c4.
* | | | | | | | | | | 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
| * | | | | | | | | | Add config.allow_debugging option to determine if the debug_assets query ↵Guillermo Iguaran2011-08-246-9/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | param can be passed by user
* | | | | | | | | | | 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 #2625
| * | | | | | | | | | 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 development.rb, test.rb and production.rb content
| * | | | | | | | | | | Test added to check mass_assignment_sanitizer is not present if ↵Arun Agrawal2011-08-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --skip-active-record provided.
* | | | | | | | | | | | Merge pull request #2647 from dmathieu/no_rescueSantiago Pastorino2011-08-242-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | remove useless rescue
| * | | | | | | | | | | | remove useless rescueDamien Mathieu2011-08-242-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | params is a method, defined in every controller, which always returns a hash. If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about.
* | | | | | | | | | | | | Merge pull request #2669 from BMorearty/remove-extra-wordSantiago Pastorino2011-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | docs: Remove extra word from sentence in initialization guide.
| * | | | | | | | | | | | Remove extra word from sentence in initialization guide.Brian Morearty2011-08-231-1/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* / | | | | | | | | | | Simplify JavaScriptHelper#escape_javascriptDaniel Schierbeck2011-08-241-7/+6
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the Linus-style conditional. Also fix the documentation slightly. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* | | | | | | | | | | `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 .gitignore
| * | | | | | | | | | | Add .rbenv-version to .gitignoreGuillermo Iguaran2011-08-201-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Make ActionController::TestCase#recycle! set @protocol to nilDavid Majda2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the protocol does not get carried over when there are two or more requests in functional tests. This was a problem when e.g. the first request was HTTP and the second request was HTTPS. Closes #2654. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* | | | | | | | | | | | 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 my name from the changelog as the amount of blogspam became ridic
| * | | | | | | | | | | | 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 ↵Joost Baaij2011-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ridiculous. " This reverts commit 95bece9155c46a2273a3febc3a2e176b8c15df8f.
| * | | | | | | | | | | | Removed my name from the changelog as the amount of blogspam became ridiculous. Joost Baaij2011-08-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When will docrails be back? :-p
* | | | | | | | | | | | | Merge pull request #2653 from luckydev/ser-wrapXavier Noria2011-08-231-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing require array/wrap in serialization
| * | | | | | | | | | | | | 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 whitespace
| * | | | | | | | | | | | | | Remove trailing whitespaceDaniel Schierbeck2011-08-231-2/+2
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #2651 from luckydev/serialization-testsJosé Valim2011-08-231-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More tests for only-include and except-include options in serialization
| * | | | | | | | | | | | | | added more tests for only-include and except-include options in serializationAnand2011-08-231-1/+14
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Don't modify params in place - fixes #2624Andrew White2011-08-232-5/+9
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2646 from guilleiguaran/add-destroy-alias-to-engineAaron Patterson2011-08-221-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Add destroy alias to engines
| * | | | | | | | | | | | Add destroy alias to enginesGuillermo Iguaran2011-08-221-2/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2411 from ai/debug_assets_by_configSantiago Pastorino2011-08-225-19/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Debug assets by config
| * | | | | | | | | | | | Allow to debug assets by config.assets.debugAndrey A.I. Sitnik2011-08-225-19/+17
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2627 from luckydev/trAaron Patterson2011-08-222-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | travis status image added
| * | | | | | | | | | | | | Travis status image added to GitHub README, excluding API pages.Anand2011-08-222-1/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #2611 from ognevsky/add-destroy-aliasAaron Patterson2011-08-222-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added destroy alias to rails generator
| * | | | | | | | | | | | | | Add Destroy AliasAndrey Ognevsky2011-08-222-1/+4
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added destroy alias to rails generator * add alias info for destroy command * Updated command line guides
* | | | | | | | | | | | | | Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251Santiago Pastorino2011-08-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use mysql_creation_options inside rescue block
| * | | | | | | | | | | | | | Use mysql_creation_options inside rescue blockJonathon M. Abbott2011-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ecd37084b28a05f05251 did not take into account the use of creation_options inside the access denied exception handler.
* | | | | | | | | | | | | | | Merge pull request #2634 from guilleiguaran/fix-sprockets-rewrite-asset-pathJoshua Peek2011-08-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sprockets rewrite_asset_path
| * | | | | | | | | | | | | | | Fix Sprockets rewrite_asset_pathGuillermo Iguaran2011-08-221-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #2631 from dasch/refactor-sprocketsSantiago Pastorino2011-08-221-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Refactor Sprockets::Helpers::RailsHelper#performing_caching?
| * | | | | | | | | | | | | | Refactor Sprockets::Helpers::RailsHelper#performing_caching?Daniel Schierbeck2011-08-221-2/+7
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need for them lines to get so long! Also, move that comment into the method body where it belongs!
* | | | | | | | | | | | | | Merge pull request #2618 from FLOChip/unicode_jAaron Patterson2011-08-212-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix escape_javascript for unicode character \u2028.
| * | | | | | | | | | | | | | fix escape_javascript for unicode character \u2028.Teng Siong Ong2011-08-212-2/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #2620 from cesario/3-1-0Santiago Pastorino2011-08-211-1/+1
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI and rename 1 misleading test case.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-27 05:16:23 +0000