Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Railties: added tests for rake assets:clean | James A. Rosen | 2011-06-21 | 2 | -2/+16 |
| | |||||
* | rake assets:clean also removes directories | James A. Rosen | 2011-06-21 | 1 | -1/+1 |
| | | | | | | See https://github.com/rails/rails/pull/1776#issuecomment-1402894, 2df2bfdb4b1165dce4b5bc3fe046147d793fead4, and 7440a254c4e724a5bbf6a0f4c8edb6d8d0432433. | ||||
* | Merge pull request #1803 from guilleiguaran/uglifier-1-0 | José Valim | 2011-06-21 | 1 | -1/+1 |
|\ | | | | | Use uglifier from rubygems instead of git repo | ||||
| * | Use uglifier from rubygems instead of git repo | Guillermo Iguaran | 2011-06-21 | 1 | -1/+1 |
| | | |||||
* | | Don't use deprecated stuff. | José Valim | 2011-06-21 | 1 | -2/+1 |
| | | |||||
* | | Assign Rails.cache to sprockets | Joshua Peek | 2011-06-21 | 1 | -0/+4 |
| | | |||||
* | | Create an :assets group in the Gemfile. | José Valim | 2011-06-21 | 7 | -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é Valim | 2011-06-21 | 4 | -81/+84 |
| | | |||||
* | | Add Rails.groups to encapsulate available groups for require. | José Valim | 2011-06-21 | 2 | -0/+38 |
|/ | |||||
* | Merge pull request #1786 from gazay/3-1-stable-regexp-fix | José Valim | 2011-06-20 | 3 | -12/+0 |
|\ | | | | | Fix regexp in generators for right catching error message | ||||
| * | Removed tests for rescue branch for Rails 2.x compatibility | Alexey Gaziev | 2011-06-20 | 2 | -9/+0 |
| | | |||||
| * | Removed rescue branch for Rails 2.x compatibility | Alexey Gaziev | 2011-06-20 | 1 | -3/+0 |
| | | |||||
| * | Fix regexp in generators for right catching error message | Alexey Gaziev | 2011-06-20 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1787 from ↵ | José Valim | 2011-06-20 | 1 | -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 Meiklejohn | 2011-06-20 | 1 | -1/+2 |
| | | |||||
| * | Streamline fragment_for SafeBuffer logic to make it more concise. | Christopher Meiklejohn | 2011-06-20 | 1 | -6/+3 |
|/ | |||||
* | Merge pull request #1785 from medwezys/master | José Valim | 2011-06-20 | 2 | -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 helper | Tadas Tamosauskas | 2011-06-20 | 2 | -2/+10 |
| | | |||||
* | | Merge pull request #1784 from gazay/3-1-stable-shadowing-variables | José Valim | 2011-06-20 | 3 | -8/+8 |
|\ \ | |/ |/| | Removing shadowing outer local variables warnings | ||||
| * | Removed shadowing variable warning in activerecord railties | Alexey Gaziev | 2011-06-20 | 1 | -1/+1 |
| | | |||||
| * | Removed warnings about shadowing variables | Alexey Gaziev | 2011-06-20 | 2 | -7/+7 |
| | | |||||
* | | Merge pull request #1780 from dazuma/fix_missing_require_set | José Valim | 2011-06-20 | 1 | -0/+2 |
|\ \ | | | | | | | Add missing require 'set' | ||||
| * | | Add missing require 'set' | Daniel Azuma | 2011-06-20 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #1776 from jamesarosen/clean_images | Joshua Peek | 2011-06-19 | 1 | -1/+1 |
|\ \ | | | | | | | assets:clean task now cleans up images | ||||
| * | | assets:clean task now cleans up images | James A. Rosen | 2011-06-19 | 1 | -1/+1 |
| |/ | |||||
* / | Call super here to allow SessionHash initialize new stuff for us | Santiago Pastorino | 2011-06-19 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1770 from arunagw/require_relative_remove | José Valim | 2011-06-19 | 1 | -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 Agrawal | 2011-06-19 | 1 | -3/+0 |
| | | | | | | | | loading rbx-require-relative > 0.0.4 | ||||
* | | explains why links are gsub'ed, and changes the regexp delimiters | Xavier Noria | 2011-06-19 | 1 | -1/+4 |
|/ | |||||
* | Ugh, the class_attribute pull request broke the build. fix it. | José Valim | 2011-06-19 | 1 | -7/+4 |
| | |||||
* | Merge pull request #1763 from grantneufeld/schema_column_exists_options_hash | José Valim | 2011-06-18 | 2 | -1/+13 |
|\ | | | | | Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists? | ||||
| * | Changed the default value for the options argument on ↵ | Grant Neufeld | 2011-06-18 | 2 | -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/master | José Valim | 2011-06-18 | 4 | -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 Hodgkiss | 2011-06-18 | 4 | -0/+34 |
| |/ | | | | | | | Rack::Sendfile to function properly. See issue #1761. | ||||
* | | Merge pull request #1765 from bensie/class_attribute_skip_reader | José Valim | 2011-06-18 | 2 | -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_attribute | James Miller | 2011-06-18 | 2 | -7/+26 |
| |/ | |||||
* | | Merge pull request #1762 from vijaydev/readme_links_rdoc | Xavier Noria | 2011-06-18 | 2 | -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 Dev | 2011-06-18 | 2 | -2/+3 |
|/ | | | | site, have them replaced at runtime during rdoc generation | ||||
* | Revert changes done in c56618ec, 51cb7459 and 030950a. The links are | Vijay Dev | 2011-06-18 | 1 | -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 Bigg | 2011-06-18 | 1 | -20/+72 |
| | | | | research | ||||
* | copy-edits 7c2db6c, cbf2af1, and f391f94 | Xavier Noria | 2011-06-18 | 2 | -3/+3 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 22 | -88/+228 |
|\ | |||||
| * | Added 'Configuring Assets' section to configuring guide | Ryan Bigg | 2011-06-18 | 1 | -0/+15 |
| | | |||||
| * | Change ActiveRecord and ActionPack links to point to the right place | Jason Noble | 2011-06-17 | 1 | -2/+2 |
| | | |||||
| * | Change ActiveRecord and ActionPack links to point to the right place | Jason Noble | 2011-06-17 | 1 | -2/+2 |
| | | |||||
| * | Change ActiveRecord and ActionPack links to point to the right place | Jason Noble | 2011-06-17 | 1 | -2/+2 |
| | | |||||
| * | Update remove_index documentation | Lucia Escanellas | 2011-06-17 | 3 | -11/+13 |
| | | | | | | | | | | * Changes should better reflect present code behavior * Related to issue: https://github.com/rails/rails/issues/1624 | ||||
| * | Typo. | R.T. Lechow | 2011-06-16 | 1 | -2/+2 |
| | | |||||
| * | minor clean up generators section | Vijay Dev | 2011-06-16 | 1 | -4/+5 |
| | | |||||
| * | add info that plugin installs need git or svn installed | Vijay Dev | 2011-06-16 | 1 | -1/+1 |
| | |