aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-09-15190-825/+2362
|\
| * Allow asset tag helper methods to accept :digest => false option in order to ↵Santiago Pastorino2011-09-148-39/+58
| | | | | | | | completely avoid the digest generation.
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-1531-233/+74
| |\
| | * 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
| | |
| | * minor editVijay Dev2011-09-141-1/+1
| | |
| | * 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
| | |
| | * Add documentation for the extending method in ActiveRecord:QueryMethodsRyan Bigg2011-09-141-0/+36
| | |
| | * Fix typos and broken link on asset pipeline guideJaime Iniesta2011-09-141-3/+3
| | |
| | * [:class_name] option in belongs_to should mention belongs_to and not has_oneErik Behrends2011-09-131-1/+1
| | |
| * | update 3.1 release date in changelogsVijay Dev2011-09-146-6/+6
| | |
| * | Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precompileJosé Valim2011-09-141-0/+1
| |\ \ | | | | | | | | Clear cache before of each precompile to avoid inconsistencies. Fixes #3014
| | * | Clear cache before of each precompile to avoid inconsistencies. Fixes #3014Guillermo Iguaran2011-09-131-0/+1
| | | |
| * | | Merge pull request #3012 from guilleiguaran/3-1-1-changelogsSantiago Pastorino2011-09-141-0/+4
| |\ \ \ | | | | | | | | | | Add missing changelog entries for actionpack
| | * | | Add missing changelog entries for actionpackGuillermo Iguaran2011-09-131-0/+4
| | | | |
| * | | | Revert "Provide a way to access to assets without using the digest, useful ↵Santiago Pastorino2011-09-143-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for static files and emails" This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db.
| * | | | Merge pull request #2964 from msgehard/silence_warningsSantiago Pastorino2011-09-141-9/+2
| |\ \ \ \ | | |/ / / | |/| | | Silence Ruby warnings about uninitialized instance variable.
| | * | | Silence Ruby warnings about uninitialized instance variable.Mike Gehard2011-09-091-9/+2
| | | | |
| * | | | Merge pull request #3011 from guilleiguaran/disable-sprockets-serverSantiago Pastorino2011-09-132-3/+17
| |\ \ \ \ | | |_|/ / | |/| | | Don't mount Sprockets if config.assets.compile is disabled
| | * | | 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-132-2/+16
| |/ / /
| * | | Stop trying to be clever about when to define attribute methods.Jon Leighton2011-09-142-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no meaningful performance penalty in defining attribute methods, since it only happens once. There is also no reason *not* to define them, since they get thrown in an included module, so they will not 'overwrite' anything. In fact, this is desirable, since it allows us to call super.
| * | | Generate attribute method unless it's already in the module.Jon Leighton2011-09-142-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no harm in generating a method name that's already defined on the host class, since we're generating the attribute methods in a module that gets included. In fact, this is desirable as it allows the host class to call super.
| * | | We don't need to build a set for DangerousAttributeError.Jon Leighton2011-09-141-7/+13
| | | | | | | | | | | | | | | | We can just use method_defined? and private_method_defined?
| * | | Provide a way to access to assets without using the digest, useful for ↵Santiago Pastorino2011-09-133-0/+6
| | | | | | | | | | | | | | | | static files and emails
| * | | Rename first_or_new to first_or_initialize.Jon Leighton2011-09-135-28/+15
| | | | | | | | | | | | | | | | | | | | For consistency with find_or_initialize_by. Also remove first_or_build alias.
| * | | delete stray backup files from guides sample appVijay Dev2011-09-132-62/+0
| | |/ | |/|
| * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-137-83/+15
| |\ \
| | * | 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 ↵dharmatech2011-09-121-2/+2
| | | | | | | | | | | | | | | | "Building a Multi-Model Form"
| | * | Merge pull request #67 from alanzeino/masterVijay Dev2011-09-121-2/+2
| | |\ \ | | | | | | | | | | 'Getting Started' guide typo fix
| | | * | Slight change to reflect current 'destroy' code generated by scaffold in 3.1 ↵Alan Zeino2011-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | release.
| | * | | Delete contribute.textile now that its contents are merged to the ↵Vijay Dev2011-09-121-70/+0
| | | | | | | | | | | | | | | | | | | | contributing_to_ruby_on_rails guide
| | * | | 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
| | | | |
| | * | | Fix a typo in dateSemyon Perepelitsa2011-09-121-1/+1
| | |/ /
| | * | merged the contribution guides and changed theVijay Dev2011-09-112-5/+7
| | | | | | | | | | | | | | | | link in the layout accordingly
| * | | Fix asset_path relative_url_root methodSantiago Pastorino2011-09-132-7/+5
| | | |
| * | | Merge pull request #3001 from guilleiguaran/fix-assets-precompile-host-testSantiago Pastorino2011-09-131-1/+1
| |\ \ \ | | | | | | | | | | Fix precompile asset_host test
| | * | | Fix precompile asset_host testGuillermo Iguaran2011-09-131-1/+1
| |/ / /
| * | | Merge pull request #3000 from guilleiguaran/fix-relative-url-rootSantiago Pastorino2011-09-131-4/+2
| |\ \ \ | | | | | | | | | | Fix for relative url root in assets
| | * | | Fix for relative url root in assetsGuillermo Iguaran2011-09-131-4/+2
| |/ / /
| * | | Merge pull request #2996 from guilleiguaran/move-assets-testsSantiago Pastorino2011-09-132-31/+31
| |\ \ \ | | | | | | | | | | Move asset tests to assets_test file
| | * | | Move asset tests to assets_test fileGuillermo Iguaran2011-09-132-31/+31
| | | | |
| * | | | always rewrite_relative_url_rootSantiago Pastorino2011-09-132-6/+2
| |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 18:02:32 +0000