Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | attr_accessible and attr_protected raise an exception pointing to use plugin ↵ | Guillermo Iguaran | 2012-09-16 | 5 | -0/+41 |
| | | | | or new protection model | ||||
* | Support fields_for attributes, which may have numeric symbols as hash keys | Guillermo Iguaran | 2012-09-16 | 2 | -0/+22 |
| | |||||
* | Add config.action_controller.permit_all_attributes to bypass ↵ | Guillermo Iguaran | 2012-09-16 | 5 | -1/+43 |
| | | | | StrongParameters protection | ||||
* | Change tainted/untainted wording to permitted/forbidden | Guillermo Iguaran | 2012-09-16 | 3 | -26/+26 |
| | |||||
* | Don't use assert_nothing_raised when assert_equal is used | Guillermo Iguaran | 2012-09-16 | 3 | -22/+10 |
| | |||||
* | Change scaffold_generator: Don't use #require or #permit in scaffold if ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -0/+4 |
| | | | | attributes list isn't given | ||||
* | Rename ForbiddenAttributes exception to ForbiddenAttributesError | Guillermo Iguaran | 2012-09-16 | 4 | -5/+5 |
| | |||||
* | config.activerecord.whitelist_attributes isn't used anymore, remove ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -3/+0 |
| | | | | reference from abstract_unit | ||||
* | Remove configuration test for config.activerecord.whitelist_attributes | Guillermo Iguaran | 2012-09-16 | 1 | -13/+0 |
| | |||||
* | Remove attributes whitelist tests from AppGenerator tests | Guillermo Iguaran | 2012-09-16 | 1 | -6/+0 |
| | |||||
* | Change scaffold_controller to generate and use private method to encapsulate ↵ | Guillermo Iguaran | 2012-09-16 | 4 | -8/+21 |
| | | | | permissible params | ||||
* | require abstract_unit in parameters tests | Guillermo Iguaran | 2012-09-16 | 3 | -0/+3 |
| | |||||
* | Remove integration between attr_accessible/protected and ↵ | Guillermo Iguaran | 2012-09-16 | 3 | -48/+2 |
| | | | | AC::Metal::ParamsWrapper | ||||
* | Remove all references to attr_accessible/protected and old ↵ | Guillermo Iguaran | 2012-09-16 | 6 | -33/+0 |
| | | | | mass_assignment_sanitizers | ||||
* | Change AMo::ForbiddenAttributesProtection tests to use a subclass of Hash ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -8/+18 |
| | | | | instead of monkey patch permitted? method in regular hashes | ||||
* | Add tests for ForbiddenAttributesProtection in ActiveRecord | Guillermo Iguaran | 2012-09-16 | 1 | -0/+63 |
| | |||||
* | Remove mass assignment security from ActiveRecord | Guillermo Iguaran | 2012-09-16 | 20 | -1170/+18 |
| | |||||
* | Remove MassAssignmentSecurity from ActiveModel | Guillermo Iguaran | 2012-09-16 | 16 | -816/+15 |
| | | | | This will be moved out to protected_attributes gem | ||||
* | Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gem | Guillermo Iguaran | 2012-09-16 | 4 | -0/+54 |
| | |||||
* | Integrate ActionController::Parameters from StrongParameters gem | Guillermo Iguaran | 2012-09-16 | 8 | -0/+340 |
| | |||||
* | Merge pull request #7662 from frodsan/ar_changelog | Rafael Mendonça França | 2012-09-16 | 1 | -44/+68 |
|\ | | | | | improve AR/CHANGELOG [ci skip] | ||||
| * | improve AR/CHANGELOG [ci skip] | Francesco Rodriguez | 2012-09-16 | 1 | -44/+68 |
|/ | |||||
* | Merge pull request #7547 from danmcclain/pg-arrays | Rafael Mendonça França | 2012-09-16 | 12 | -53/+435 |
|\ | | | | | Adds migration and type casting support for PostgreSQL Array datatype | ||||
| * | Moves column dump specific code to a module included in AbstractAdapter | Dan McClain | 2012-09-14 | 12 | -53/+435 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having column related schema dumper code in the AbstractAdapter. The code remains the same, but by placing it in the AbstractAdapter, we can then overwrite it with Adapter specific methods that will help with Adapter specific data types. The goal of moving this code here is to create a new migration key for PostgreSQL's array type. Since any datatype can be an array, the goal is to have ':array => true' as a migration option, turning the datatype into an array. I've implemented this in postgres_ext, the syntax is shown here: https://github.com/dockyard/postgres_ext#arrays Adds array migration support Adds array_test.rb outlining the test cases for array data type Adds pg_array_parser to Gemfile for testing Adds pg_array_parser to postgresql_adapter (unused in this commit) Adds schema dump support for arrays Adds postgres array type casting support Updates changelog, adds note for inet and cidr support, which I forgot to add before Removing debugger, Adds pg_array_parser to JRuby platform Removes pg_array_parser requirement, creates ArrayParser module used by PostgreSQLAdapter | ||||
* | | Remove debug code :bomb: | Rafael Mendonça França | 2012-09-16 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #7651 from steveklabnik/issue_3956 | Rafael Mendonça França | 2012-09-16 | 2 | -2/+33 |
|\ \ | | | | | | | | | | | | | | | | Don't preserve SELECT columns on COUNT Closes #7651 | ||||
| * | | Don't preserve SELECT columns on COUNT | Steve Klabnik | 2012-09-16 | 2 | -2/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The COUNT clause of a finder_sql relationship is being rewritten from COUNT(*) to COUNT(table_name.*). This does not appear to be valid syntax in MySQL: ``` mysql> SELECT COUNT( table_name.* ) FROM `table_name`; ERROR 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '* ) FROM `table_name`' at line 1 ``` This fixes the bug, as well as adding tests so we don't re-introduce it in the future. Fixes #3956. | ||||
* | | | Merge pull request #7645 from larrylv/configurable-defaults | Rafael Mendonça França | 2012-09-16 | 3 | -8/+45 |
|\ \ \ | | | | | | | | | Set up config_accessor with a default value by block | ||||
| * | | | set up config_accessor with a default value by block | Larry Lv | 2012-09-17 | 3 | -8/+45 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ActiveSupport::Configurable should allow config_accessor to take default value by block, just like cattr_accessor. class User include ActiveSupport::Configurable config_accessor :hair_colors do [:brown, :black, :blonde, :red] end end User.hair_colors # => [:brown, :black, :blonde, :red] * remove trailing whitespaces in configurable.rb and its test file. * Update ActiveSupport CHANGELOG. | ||||
* | | | Merge pull request #7657 from kennyj/fix_6458-2 | Piotr Sarnacki | 2012-09-16 | 3 | -1/+14 |
|\ \ \ | | | | | | | | | Don't explain except normal CRUD sql. | ||||
| * | | | Don't explain except normal CRUD sql. | kennyj | 2012-09-17 | 3 | -1/+14 |
| | | | | |||||
* | | | | Merge pull request #7652 from toshi-kawanishi/find_in_batches | Carlos Antonio da Silva | 2012-09-16 | 4 | -6/+38 |
|\| | | | | | | | | | | | Fix find_in_batches with customized primary_key | ||||
| * | | | Fix find_in_batches with customized primary_key | Toshiyuki Kawanishi | 2012-09-16 | 4 | -6/+38 |
|/ / / | |||||
* | | | Merge pull request #7648 from kennyj/rename_2_schema | Rafael Mendonça França | 2012-09-15 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | Query for loading index info should be marked as SCHEMA. | ||||
| * | | | Query for sequence info also should be markd as SCHEMA. | kennyj | 2012-09-15 | 1 | -3/+3 |
| | | | | |||||
| * | | | Query for loading index info should be marked as SCHEMA. | kennyj | 2012-09-15 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #7656 from czarneckid/clarify-documentation | Xavier Noria | 2012-09-15 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Clarify the documentation on the Rails::Application#call method | ||||
| * | | | | Clarify the documentation on the Rails::Application#call method | David Czarnecki | 2012-09-15 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Check if etag exists before to do the gsub | Rafael Mendonça França | 2012-09-15 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981 | ||||
* | | | | Merge pull request #7655 from steveklabnik/master | Rafael Mendonça França | 2012-09-15 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | fix the build | ||||
| * | | | fix the build | Steve Klabnik | 2012-09-15 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #7643 from steveklabnik/deprecate_silence | Rafael Mendonça França | 2012-09-15 | 3 | -12/+23 |
|\ \ \ | | | | | | | | | Deprecate ActiveSupport::Benchmarkable#silence. | ||||
| * | | | Deprecate ActiveSupport::Benchmarkable#silence. | Steve Klabnik | 2012-09-15 | 3 | -12/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to its lack of thread safety, we're deprecating this, and it will be removed in Rails 4.1. Fixes #4060. | ||||
* | | | | Merge pull request #7654 from steveklabnik/issue_4857 | Xavier Noria | 2012-09-15 | 1 | -0/+8 |
|\ \ \ \ | | | | | | | | | | | Improve Process::Status#to_json | ||||
| * | | | | Improve Process::Status#to_json | Steve Klabnik | 2012-09-15 | 1 | -0/+8 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because Process::Status has no instance_variables, the ActiveSupport version of #to_json produces {}, which isn't good. Therefore, we implement our own #as_json, which makes it useful again. Fixes #4857 | ||||
* | | | | Merge pull request #7649 from steveklabnik/issue_2520 | Rafael Mendonça França | 2012-09-15 | 3 | -1/+48 |
|\ \ \ \ | | | | | | | | | | | Support for multiple etags in an If-None-Match header | ||||
| * | | | | Support for multiple etags in an If-None-Match header | Travis Warlick | 2012-09-15 | 3 | -1/+48 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb | ||||
* | | | | Fix syntax error in assert_match | Rafael Mendonça França | 2012-09-15 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #7653 from arunagw/warnings-removed | Rafael Mendonça França | 2012-09-15 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Few more warnings removed. | ||||
| * | | | | Few more warnings removed. | Arun Agrawal | 2012-09-15 | 2 | -4/+4 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | I found them when I was running warning mode on with railties See https://github.com/rails/rails/pull/3782 |