aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Railties: added tests for rake assets:cleanJames A. Rosen2011-06-212-2/+16
|
* rake assets:clean also removes directoriesJames A. Rosen2011-06-211-1/+1
| | | | | | See https://github.com/rails/rails/pull/1776#issuecomment-1402894, 2df2bfdb4b1165dce4b5bc3fe046147d793fead4, and 7440a254c4e724a5bbf6a0f4c8edb6d8d0432433.
* Merge pull request #1803 from guilleiguaran/uglifier-1-0José Valim2011-06-211-1/+1
|\ | | | | Use uglifier from rubygems instead of git repo
| * Use uglifier from rubygems instead of git repoGuillermo Iguaran2011-06-211-1/+1
| |
* | Don't use deprecated stuff.José Valim2011-06-211-2/+1
| |
* | Assign Rails.cache to sprocketsJoshua Peek2011-06-211-0/+4
| |
* | Create an :assets group in the Gemfile.José Valim2011-06-217-23/+48
| | | | | | | | | | | | | | | | | | This group is required by default only on development and test (you can change it on config/application.rb). `rake assets:precompile` will automatically add the assets group to Rails.groups (and consequently Bundler.require) and should work transparently.
* | Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess.José Valim2011-06-214-81/+84
| |
* | Add Rails.groups to encapsulate available groups for require.José Valim2011-06-212-0/+38
|/
* Merge pull request #1786 from gazay/3-1-stable-regexp-fixJosé Valim2011-06-203-12/+0
|\ | | | | Fix regexp in generators for right catching error message
| * Removed tests for rescue branch for Rails 2.x compatibilityAlexey Gaziev2011-06-202-9/+0
| |
| * Removed rescue branch for Rails 2.x compatibilityAlexey Gaziev2011-06-201-3/+0
| |
| * Fix regexp in generators for right catching error messageAlexey Gaziev2011-06-201-1/+1
| |
* | Merge pull request #1787 from ↵José Valim2011-06-201-6/+4
|\ \ | |/ |/| | | | | cmeiklejohn/make_fragment_for_more_robust_for_subclasses_of_safe_buffer fragment_for assumes ActionView::OutputBuffer.
| * Only mark the sliced buffer as safe, if it was safe to begin with.Christopher Meiklejohn2011-06-201-1/+2
| |
| * Streamline fragment_for SafeBuffer logic to make it more concise.Christopher Meiklejohn2011-06-201-6/+3
|/
* Merge pull request #1785 from medwezys/masterJosé Valim2011-06-202-2/+10
|\ | | | | Do not change a frozen text passed to simple_format text helper
| * Do not change a frozen text passed to simple_format text helperTadas Tamosauskas2011-06-202-2/+10
| |
* | Merge pull request #1784 from gazay/3-1-stable-shadowing-variablesJosé Valim2011-06-203-8/+8
|\ \ | |/ |/| Removing shadowing outer local variables warnings
| * Removed shadowing variable warning in activerecord railtiesAlexey Gaziev2011-06-201-1/+1
| |
| * Removed warnings about shadowing variablesAlexey Gaziev2011-06-202-7/+7
| |
* | Merge pull request #1780 from dazuma/fix_missing_require_setJosé Valim2011-06-201-0/+2
|\ \ | | | | | | Add missing require 'set'
| * | Add missing require 'set'Daniel Azuma2011-06-201-0/+2
|/ /
* | Merge pull request #1776 from jamesarosen/clean_imagesJoshua Peek2011-06-191-1/+1
|\ \ | | | | | | assets:clean task now cleans up images
| * | assets:clean task now cleans up imagesJames A. Rosen2011-06-191-1/+1
| |/
* / Call super here to allow SessionHash initialize new stuff for usSantiago Pastorino2011-06-191-1/+1
|/
* Merge pull request #1770 from arunagw/require_relative_removeJosé Valim2011-06-191-3/+0
|\ | | | | Removing require_relative gem. Linecache new version 0.46 is out and it's
| * Removing require_relative gem. Linecache new version 0.46 is out and it's ↵Arun Agrawal2011-06-191-3/+0
| | | | | | | | loading rbx-require-relative > 0.0.4
* | explains why links are gsub'ed, and changes the regexp delimitersXavier Noria2011-06-191-1/+4
|/
* Ugh, the class_attribute pull request broke the build. fix it.José Valim2011-06-191-7/+4
|
* Merge pull request #1763 from grantneufeld/schema_column_exists_options_hashJosé Valim2011-06-182-1/+13
|\ | | | | Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
| * Changed the default value for the options argument on ↵Grant Neufeld2011-06-182-1/+13
| | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::Table#column_exists? from nil to an empty Hash {}. That method calls through to ActiveRecord::ConnectionAdapters::SchemaStatements##column_exists? expects options to be a Hash. When options was nil, an error would occur in cases where the column did exist because the called method attempted to perform a key lookup on options.
* | Merge pull request #1764 from stevehodgkiss/masterJosé Valim2011-06-184-0/+34
|\ \ | | | | | | Fix inconsistencies with serving images in production mode when ActiveRecord is loaded
| * | Fix inconsistencies by being polite to the wrapped body. Needed for ↵Steve Hodgkiss2011-06-184-0/+34
| |/ | | | | | | Rack::Sendfile to function properly. See issue #1761.
* | Merge pull request #1765 from bensie/class_attribute_skip_readerJosé Valim2011-06-182-7/+26
|\ \ | | | | | | Add option to omit creating an instance reader method on class_attribute
| * | Add option to omit creating an instance reader method on class_attributeJames Miller2011-06-182-7/+26
| |/
* | Merge pull request #1762 from vijaydev/readme_links_rdocXavier Noria2011-06-182-2/+3
|\ \ | |/ |/| Solving the problem of links being broken in GitHub for the sake of api site
| * To solve the problem of links being broken in GitHub for the sake of api ↵Vijay Dev2011-06-182-2/+3
|/ | | | site, have them replaced at runtime during rdoc generation
* Revert changes done in c56618ec, 51cb7459 and 030950a. The links areVijay Dev2011-06-181-2/+2
| | | | | pointing to files/*/*.html for usage in api.rubyonrails.org and as a result are broken in GitHub blobs. This is unavoidable (at least for now).
* Flesh out the asset pipeline guide with information learned from today's ↵Ryan Bigg2011-06-181-20/+72
| | | | research
* copy-edits 7c2db6c, cbf2af1, and f391f94Xavier Noria2011-06-182-3/+3
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-1822-88/+228
|\
| * Added 'Configuring Assets' section to configuring guideRyan Bigg2011-06-181-0/+15
| |
| * Change ActiveRecord and ActionPack links to point to the right place Jason Noble2011-06-171-2/+2
| |
| * Change ActiveRecord and ActionPack links to point to the right place Jason Noble2011-06-171-2/+2
| |
| * Change ActiveRecord and ActionPack links to point to the right placeJason Noble2011-06-171-2/+2
| |
| * Update remove_index documentationLucia Escanellas2011-06-173-11/+13
| | | | | | | | | | * Changes should better reflect present code behavior * Related to issue: https://github.com/rails/rails/issues/1624
| * Typo.R.T. Lechow2011-06-161-2/+2
| |
| * minor clean up generators sectionVijay Dev2011-06-161-4/+5
| |
| * add info that plugin installs need git or svn installedVijay Dev2011-06-161-1/+1
| |