aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | 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.
* | | | | | Fix sprockets warningsJoshua Peek2011-08-213-7/+20
|/ / / / / | | | | | | | | | | | | | | | Fixes #2598
* | | | | Merge pull request #2610 from asmega/documentationXavier Noria2011-08-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | added link to url_for in documentation
| * | | | | Use typewriter styling on url_for in documentationasmega2011-08-211-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14Santiago Pastorino2011-08-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Bump sprockets to 2.0.0.beta.14
| * | | | | Bump sprockets to 2.0.0.beta.14Guillermo Iguaran2011-08-201-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2600 from al/finder_sql_example_updateXavier Noria2011-08-211-6/+10
|\ \ \ \ \ | |/ / / / |/| | | | Updated the docs for the has_many :finder_sql option
| * | | | Updated the docs for the has_many :finder_sql option to reflect changes made ↵Alan Larkin2011-08-201-6/+10
| | | | | | | | | | | | | | | | | | | | in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required.
* | | | | Merge pull request #2596 from dharmatech/patch-1Santiago Pastorino2011-08-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | ActionController::Redirecting : fix docs typo
| * | | | | ActionController::Redirecting : fix docs typodharmatech2011-08-201-1/+1
| |/ / / /
* | | | | Merge pull request #2595 from smartinez87/assets-guideSantiago Pastorino2011-08-201-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Document debugging assets set by default for dev and test envs on guides
| * | | | | Document debugging assets set by default for dev and test envs in the ↵Sebastian Martinez2011-08-191-0/+2
| |/ / / / | | | | | | | | | | | | | | | asset_pipeline guide.
* | | | | Merge pull request #2597 from dharmatech/patch-2Santiago Pastorino2011-08-201-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | actionpack/lib/action_controller/base.rb: docs typo
| * | | | actionpack/lib/action_controller/base.rb: docs typodharmatech2011-08-201-1/+1
| |/ / /
* | | | Merge pull request #2604 from vijaydev/params_wrapper_docsSantiago Pastorino2011-08-201-4/+3
|\ \ \ \ | | | | | | | | | | Minor edit in the params wrapper api docs
| * | | | params wrapper docs correctionVijay Dev2011-08-211-4/+3
| |/ / /
* | | | Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumptionAaron Patterson2011-08-202-1/+24
|\ \ \ \ | | | | | | | | | | Fix assumption of primary key name in PredicateBuilder subquery.
| * | | | Fix PredicateBuilder clobbering select_values in subquery.Ernie Miller2011-08-202-1/+14
| | | | |
| * | | | Fix assumption of primary key name in PredicateBuilder subquery.Ernie Miller2011-08-202-1/+11
| |/ / /
* | | | Merge pull request #2603 from vijaydev/guidesSantiago Pastorino2011-08-201-1/+1
|\ \ \ \ | |/ / / |/| | | Minor change in the 3.1 release notes
| * | | minor change in the 3.1 release notesVijay Dev2011-08-201-1/+1
|/ / /
* | | Merge pull request #2581 from guilleiguaran/debug-assets-in-devSantiago Pastorino2011-08-192-8/+24
|\ \ \ | | | | | | | | Debug assets by default in development and test environments
| * | | Debug assets by default in development and test environmentsGuillermo Iguaran2011-08-182-8/+24
| | | |
* | | | Merge pull request #2589 from vijaydev/guidesXavier Noria2011-08-191-31/+26
|\ \ \ \ | |/ / / |/| | | Mailer guide fixes
| * | | mailer guide: fixes indentation, and use fixed width fonts wherever necessaryVijay Dev2011-08-201-31/+26
|/ / /
* | | minor details revised in a gsubXavier Noria2011-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Regexps have a construct to express alternation of characters, which is character classes. In addition to being the most specific idiom to write this pattern, it reads better without the backslashes. Also, it is better not to use a capture if none is needed. As a side-effect of these changes, the gsub is marginally faster, but speed is not the point of this commit.
* | | Merge branch 'master' of https://github.com/lifo/docrailsXavier Noria2011-08-1715-26/+5
|\ \ \
| * | | Updates to remove extra whitespaces and notably fix a whitespace issue with ↵Jeff Dutil2011-08-1610-22/+1
| | | | | | | | | | | | | | | | ajax_on_rails causing a code block not to render the entire block properly.
| * | | Fix typo in i18n.textile header and remove extra whitespace.Jeff Dutil2011-08-161-2/+1
| | | |
| * | | Fix ruby typo to correctly render code block in initializer.textileJeff Dutil2011-08-162-2/+2
| | | |
| * | | Fix spacing in plugins.textile to fix html rendering and remove extra ↵Jeff Dutil2011-08-162-1/+2
| | | | | | | | | | | | | | | | whitespace from security.textile
* | | | fixes generation of the AR querying guideXavier Noria2011-08-171-2/+2
| | | |
* | | | Merge pull request #2551 from rgo/remove-blank-spaces-application-cssXavier Noria2011-08-171-3/+3
|\ \ \ \ | | | | | | | | | | Cleanup application.css