aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1811 from ↵Aaron Patterson2011-06-215-23/+88
|\ | | | | | | | | nicksieger/more-jruby-gem-for-database-fixes-master More jruby gem for database fixes master
| * Use non-'jdbc*' names so that db:create and db:drop workNick Sieger2011-06-213-9/+9
| |
| * Convert database names to ones appropriate for JRubyNick Sieger2011-06-211-1/+12
| |
| * Add generic 'jdbc' database optionNick Sieger2011-06-212-4/+67
| |
| * Remove superfluous pg driver install instructionsNick Sieger2011-06-211-9/+0
|/
* Require helpers so autoload is properly setup.José Valim2011-06-211-1/+1
|
* Merge pull request #1632 from tardate/pg_schema_fuAaron Patterson2011-06-214-50/+285
|\ | | | | Improving PostgreSQL adapter schema-awareness
| * Merge remote branch 'rails/master' into pg_schema_fuPaul Gallagher2011-06-1995-542/+1294
| |\
| * | Make PostgreSQL adapter view-compatiblePaul Gallagher2011-06-193-4/+54
| | | | | | | | | * amongst other things, allows meta_search to run against view-backed models
| * | make extract_schema_and_table a private methodPaul Gallagher2011-06-112-27/+24
| | |
| * | remove table quoting in primary_key methodPaul Gallagher2011-06-113-6/+48
| | | | | | | | | * add/cleanup tests
| * | apply private method indentation conventionPaul Gallagher2011-06-103-25/+25
| | | | | | | | | * tidy test code and fix my typo
| * | Improve PostgreSQL adapter schema-awarenessPaul Gallagher2011-06-103-27/+173
| | | | | | | | | | | | | | | | | | | | | * table_exists? scoped by schema search path unless schema is explicitly named. Added tests and doc to clarify the behaviour * extract_schema_and_table tests and implementation extended to cover all cases * primary_key does not ignore schema information * add current_schema and schema_exists? methods * more robust table referencing in insert_sql and sql_for_insert methods
* | | Merge pull request #1793 from jamesarosen/clean_imagesJosé Valim2011-06-212-2/+16
|\ \ \ | | | | | | | | rake assets:clean also removes directories
| * | | 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.
* | | | Bump sprockets requirementJoshua Peek2011-06-211-1/+1
|/ / /
* | | 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