| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update CHANGELOG. | José Valim | 2011-06-22 | 1 | -10/+5 |
| | | |||||
| * | Merge pull request #1790 from ernie/reverse_sql_order_fix | Aaron Patterson | 2011-06-22 | 2 | -3/+24 |
| |\ | | | | | Support reversal of ARel orderings in reverse_sql_order | ||||
| | * | Support reversal of ARel orderings in reverse_sql_order | Ernie Miller | 2011-06-20 | 2 | -3/+24 |
| | | | |||||
| * | | Merge pull request #1750 from dmathieu/non_string_methods | Xavier Noria | 2011-06-22 | 2 | -2/+6 |
| |\ \ | | | | | | | Calling unsafe methods which don't return a string shouldn't fail | ||||
| | * | | calling unsafe methods which don't return a string shouldn't fail | Damien Mathieu | 2011-06-22 | 2 | -2/+6 |
| | | | | |||||
| * | | | Merge pull request #1813 from arunagw/jruby_tests | José Valim | 2011-06-22 | 1 | -3/+18 |
| |\ \ \ | | | | | | | | | Tests Added for jdbc option added for Jruby | ||||
| | * | | | Tests added when no option is given with #jruby. It should generate | Arun Agrawal | 2011-06-22 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | sqlite3 based app | ||||
| | * | | | Making tests according to the changes #jruby | Arun Agrawal | 2011-06-22 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | Test added for jdbc-adapter | Arun Agrawal | 2011-06-22 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge pull request #1778 from spohlenz/hash-models | José Valim | 2011-06-22 | 3 | -1/+28 |
| |\ \ \ \ | |/ / / |/| | | | Fix nested fields_for when Hash-based model is passed. | ||||
| | * | | | Use real hash model in nested fields_for with hash model test | Sam Pohlenz | 2011-06-22 | 2 | -4/+13 |
| | | | | | |||||
| | * | | | Test for extractable_options? within nested fields_for. | Sam Pohlenz | 2011-06-20 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | This fixes an error when a record object that is a subclass of Hash is passed to fields_for, which is incorrectly interpreted as field options. | ||||
| * | | | | Merge pull request #1811 from ↵ | Aaron Patterson | 2011-06-21 | 5 | -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 work | Nick Sieger | 2011-06-21 | 3 | -9/+9 |
| | | | | | | |||||
| | * | | | | Convert database names to ones appropriate for JRuby | Nick Sieger | 2011-06-21 | 1 | -1/+12 |
| | | | | | | |||||
| | * | | | | Add generic 'jdbc' database option | Nick Sieger | 2011-06-21 | 2 | -4/+67 |
| | | | | | | |||||
| | * | | | | Remove superfluous pg driver install instructions | Nick Sieger | 2011-06-21 | 1 | -9/+0 |
| |/ / / / | |||||
| * | | | | Require helpers so autoload is properly setup. | José Valim | 2011-06-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1632 from tardate/pg_schema_fu | Aaron Patterson | 2011-06-21 | 4 | -50/+285 |
| |\ \ \ \ | | | | | | | | | | | Improving PostgreSQL adapter schema-awareness | ||||
| | * \ \ \ | Merge remote branch 'rails/master' into pg_schema_fu | Paul Gallagher | 2011-06-19 | 95 | -542/+1294 |
| | |\ \ \ \ | |||||
| | * | | | | | Make PostgreSQL adapter view-compatible | Paul Gallagher | 2011-06-19 | 3 | -4/+54 |
| | | | | | | | | | | | | | | | | | | | * amongst other things, allows meta_search to run against view-backed models | ||||
| | * | | | | | make extract_schema_and_table a private method | Paul Gallagher | 2011-06-11 | 2 | -27/+24 |
| | | | | | | | |||||
| | * | | | | | remove table quoting in primary_key method | Paul Gallagher | 2011-06-11 | 3 | -6/+48 |
| | | | | | | | | | | | | | | | | | | | * add/cleanup tests | ||||
| | * | | | | | apply private method indentation convention | Paul Gallagher | 2011-06-10 | 3 | -25/+25 |
| | | | | | | | | | | | | | | | | | | | * tidy test code and fix my typo | ||||
| | * | | | | | Improve PostgreSQL adapter schema-awareness | Paul Gallagher | 2011-06-10 | 3 | -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_images | José Valim | 2011-06-21 | 2 | -2/+16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | rake assets:clean also removes directories | ||||
| | * | | | | | | 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. | ||||
| * | | | | | | | Bump sprockets requirement | Joshua Peek | 2011-06-21 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | 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 |
| |/ / / / / | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |