| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Use strict_args_position! if available from Thor | José Valim | 2012-06-18 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge pull request #6764 from frodsan/patch-4 | Rafael Mendonça França | 2012-06-17 | 1 | -2/+2 | |
| |\ \ | | | | | | | bump AS deprecation_horizon to 4.0 | |||||
| | * | | bump AS deprecation_horizon to 4.0 | Francesco Rodríguez | 2012-06-17 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #6756 from arunagw/build_fix_ap | Rafael Mendonça França | 2012-06-16 | 1 | -1/+1 | |
| |\ \ | | | | | | | Build fix actionpack | |||||
| | * | | It should also include text/css => Build Fix | Arun Agrawal | 2012-06-16 | 1 | -1/+1 | |
| |/ / | ||||||
| * / | Merge pull request #6752 from steveklabnik/fix_5680 | Rafael Mendonça França | 2012-06-16 | 3 | -4/+21 | |
| |/ | | | | Respect absolute paths in compute_source_path. | |||||
| * | Remove unneded tests. | Rafael Mendonça França | 2012-06-14 | 1 | -11/+1 | |
| | | | | | | | | Before b081f6b59fb3f15d12043072ad9b331ffd2bc56e, this test are asserting that update_attribute does the dirty tracking. Since we deprecated this method and update_column write in the database directly this tests will always fail. | |||||
| * | registers the deprecation of update_attribute in the CHANGELOG | Xavier Noria | 2012-06-14 | 1 | -0/+8 | |
| | | ||||||
| * | Merge pull request #6739 from steveklabnik/3-2-stable | Xavier Noria | 2012-06-14 | 7 | -17/+41 | |
| |\ | | | | | Deprecate update_attribute | |||||
| | * | Deprecate update_attribute. | Steve Klabnik | 2012-06-14 | 7 | -17/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | Historically, update_attribute and update_attributes are similar, but with one big difference: update_attribute does not run validations. These two methods are really easy to confuse given their similar names. Therefore, update_attribute is being deprecated in favor of update_column, and will be removed in Rails 4. See the discussion on rails-core here: https://groups.google.com/d/topic/rubyonrails-core/BWPUTK7WvYA/discussion | |||||
| * | | adding a test for #6459 | Aaron Patterson | 2012-06-14 | 1 | -0/+10 | |
| |/ | ||||||
| * | ActionController::Caching depends on RackDelegation and ↵ | Santiago Pastorino | 2012-06-13 | 2 | -0/+35 | |
| | | | | | AbstractController::Callbacks | |||||
| * | Merge pull request #6716 from frodsan/patch-2 | Rafael Mendonça França | 2012-06-12 | 1 | -1/+1 | |
| |\ | | | | | Fix Build | |||||
| | * | Fix build | Francesco Rodríguez | 2012-06-12 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch '3-2-stable-rel' into 3-2-stable | Aaron Patterson | 2012-06-12 | 20 | -16/+58 | |
| |\ | | | | | | | | | | | | | | | | | | | * 3-2-stable-rel: updating changelogs bumping version numbers updating changelogs with security fixes updating changelogs Array parameters should not contain nil values. Additional fix for CVE-2012-2661 | |||||
| | * | updating changelogs | Aaron Patterson | 2012-06-12 | 7 | -7/+11 | |
| | | | ||||||
| | * | bumping version numbers | Aaron Patterson | 2012-06-11 | 9 | -9/+9 | |
| | | | ||||||
| | * | updating changelogs with security fixes | Aaron Patterson | 2012-06-11 | 2 | -0/+6 | |
| | | | ||||||
| | * | updating changelogs | Aaron Patterson | 2012-06-11 | 5 | -0/+20 | |
| | | | ||||||
| | * | Array parameters should not contain nil values. | Aaron Patterson | 2012-06-11 | 2 | -2/+8 | |
| | | | ||||||
| | * | Additional fix for CVE-2012-2661 | Ernie Miller | 2012-06-11 | 2 | -3/+9 | |
| | | | | | | | | | | | | | | | | | While the patched PredicateBuilder in 3.1.5 prevents a user from specifying a table name using the `table.column` format, it doesn't protect against the nesting of hashes changing the table context in the next call to build_from_hash. This fix covers this case as well. | |||||
| * | | Merge pull request #6715 from arunagw/add_asserts | Rafael Mendonça França | 2012-06-12 | 1 | -2/+2 | |
| | | | | | | | | | Need a assert here in tests | |||||
| * | | Merge pull request #6676 from aurelian/master | Rafael Mendonça França | 2012-06-12 | 2 | -1/+5 | |
| | | | | | | | | | Don't assign the attributes if the list is empty | |||||
| * | | Merge pull request #6682 from acapilleri/dup_validation_fix_backport_for_1_9_3 | Rafael Mendonça França | 2012-06-12 | 3 | -1/+16 | |
| |\ \ | |/ |/| | Dup validation fix backport for 1 9 3 | |||||
| | * | Fix the the backport of the object dup with the ruby 1.9.3p194. | Angelo capilleri | 2012-06-12 | 3 | -1/+16 | |
| | | | | | | | | | | | | | At the end of initialize_dup was added the call to super if it exists, so it also works with 1.8.7 where initialize_dup doesn't exist. This issu was introduced with the pull request #6324 | |||||
| * | | Change the string to use in test case. | kennyj | 2012-06-11 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb activerecord/test/cases/adapters/mysql2/schema_test.rb | |||||
| * | | Fix GH #3163. Should quote database on mysql/mysql2. | kennyj | 2012-06-11 | 3 | -1/+22 | |
| | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb | |||||
| * | | Merge pull request #6690 from suginoy/fix-templates-copy | Rafael Mendonça França | 2012-06-11 | 2 | -1/+13 | |
| | | | | | | | | | | | | | Fix: 'rake rails:templates:copy' doesn't work Conflicts: railties/test/application/rake_test.rb | |||||
| * | | Merge pull request #6698 from yahonda/address_ora_911_master | Rafael Mendonça França | 2012-06-11 | 2 | -2/+2 | |
| | | | | | | | | | Address ORA-00911 errors because of the heading underscore. | |||||
| * | | Merge pull request #6521 from Empact/throw-result | Rafael Mendonça França | 2012-06-10 | 2 | -1/+8 | |
| | | | | | | | | | | | | | Fix that #exists? can blow up with ThrowResult exception Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | |||||
| * | | Remove warning | Rafael Mendonça França | 2012-06-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add test to column alias in `exists?` SQL. | Rafael Mendonça França | 2012-06-10 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | This behavior was added in dd286a4c735dac1db8c9262581c7f29c44d1f695 Closes #1139. Fixes #2553, #1141, #1623 and #2062. | |||||
| * | | Minimal change to query generation of exists? that makes SQLServer and ↵ | iaddict | 2012-06-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | others happy that do not work without a column alias. Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | |||||
| * | | Merge pull request #6688 from ↵ | Rafael Mendonça França | 2012-06-10 | 2 | -2/+7 | |
| |\ \ | | | | | | | | | | | | | c42engineering/buffered_logger_level_while_creation BufferedLogger level while creation | |||||
| | * | | buffered logger is initialized with the log level passed trough the initializer | Niranjan Paranjape | 2012-06-09 | 2 | -2/+7 | |
| | | | | ||||||
| * | | | Merge pull request #6695 from kennyj/fix_6635 | Rafael Mendonça França | 2012-06-10 | 2 | -5/+14 | |
| | | | | | | | | | | | | | Fix #6635. We should call Scoping methods, before calling Array methods. | |||||
| * | | | Merge pull request #6693 from jkraemer/3-2-stable | José Valim | 2012-06-10 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Bugfix: Namespace collision with test-unit-activesupport 1.0.0 | |||||
| | * | | | fix namespace collision with test-unit-activesupport | Jens Kraemer | 2012-06-10 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #6687 from tiegz/3-2-optimizations | José Valim | 2012-06-09 | 1 | -1/+3 | |
| |\ \ \ | | | | | | | | | ActiveRecord#attributes optimization: minimize objects created | |||||
| | * | | | ActiveRecord#attributes optimization: minimize objects created | Tieg Zaharia | 2012-06-09 | 1 | -1/+3 | |
| | |/ / | ||||||
| * | | | Merge pull request #6689 from arunagw/duplicate_test_removed | Andrew White | 2012-06-09 | 1 | -16/+0 | |
| |\ \ \ | |/ / |/| | | Duplicate test removed | |||||
| | * | | Duplicate tests removed. | Arun Agrawal | 2012-06-09 | 1 | -16/+0 | |
| |/ / | ||||||
| * | | Don't add sqlite3 to gemspec with -O on rails plugin new | Piotr Sarnacki | 2012-06-08 | 2 | -0/+10 | |
| | | | | | | | | | (closes #6672) | |||||
| * | | Merge pull request #6678 from arunagw/fix_issue_6673 | Rafael Mendonça França | 2012-06-08 | 2 | -1/+9 | |
| |\ \ | | | | | | | Fix issue 6673 | |||||
| | * | | We should not include engine.rake file into rake | Arun Agrawal | 2012-06-08 | 2 | -1/+9 | |
| | |/ | | | | | | | | | | | | | | | | | | | if we are passing -T which is skip_test_unit See issue #6673 for more details. I saw that we are not creating dummy app even if we do skip_test_unit. Fixes #6673 | |||||
| * | | Merge pull request #6677 from arunagw/3-2-stable | Rafael Mendonça França | 2012-06-08 | 1 | -2/+0 | |
| |\ \ | |/ |/| | Removed protected as we already doing it above. | |||||
| | * | Removed protected as we already doing it above. | Arun Agrawal | 2012-06-08 | 1 | -2/+0 | |
| |/ | ||||||
| * | Fix railties test suite | Piotr Sarnacki | 2012-06-08 | 1 | -2/+1 | |
| | | | | | | | Apparently asset_environment should not be invoked if it's not needed. This fixes broken build by getting back to the code more similar to the version changed here: 5b0a891 | |||||
| * | Fix asset tags for files with more than one dot | Piotr Sarnacki | 2012-06-07 | 4 | -1/+9 | |
| | | | | | | | | | | | | | | | | After the fix done in 39f9f02a, there are cases that will not work correctly. If you have file with "2 extensions", like foo.min.js and you reference the file without extension, like: javascript_include_tag "foo.min" it will fail because sprockets finds foo.min.js with foo.min argument. This commit fixes this case and will get the right file even when referrencing it without extension. (closes #6598) | |||||
| * | Make test cover previous reversion | Jon Leighton | 2012-06-07 | 1 | -0/+1 | |
| | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |