Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15957 from seuros/duplicate | Yves Senn | 2014-06-28 | 1 | -12/+3 |
|\ | | | | | [Postgresql tests] remove duplicate helper | ||||
| * | [Postgresql tests] remove duplicate helper | Abdelkader Boudih | 2014-06-28 | 1 | -12/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-06-28 | 1 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | [ci skip] Add missing colon and period in initialization.md. | Juanito Fatas | 2014-06-25 | 1 | -3/+3 |
| | | |||||
| * | Revert "Formatting fix in AS changelog [ci skip]" | Rafael Mendonça França | 2014-06-16 | 1 | -5/+2 |
| | | | | | | | | | | | | This reverts commit cede0363830e28e73feafc662eccae7d1db526bb. Reason: CHANGELOG should not be updated on docrails | ||||
| * | Formatting fix in AS changelog [ci skip] | Juanjo Bazán | 2014-06-16 | 1 | -2/+5 |
| | | |||||
* | | Merge pull request #15955 from JuanitoFatas/levenshtein-guide | Guillermo Iguaran | 2014-06-28 | 1 | -21/+29 |
|\ \ | | | | | | | Update the levenshtein distance method in guides. | ||||
| * | | Update the levenshtein distance method in guides. | Juanito Fatas | 2014-06-28 | 1 | -21/+29 |
| | | | |||||
* | | | Merge pull request #15954 from roryokane/getting-started-guide-add-period | Sean Griffin | 2014-06-28 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Add missing period in Getting Started guide | ||||
| * | | Add missing period in Getting Started guide | Rory O’Kane | 2014-06-28 | 1 | -1/+1 |
|/ / | | | | | | | Within section 5.10 Adding Some Validation | ||||
* | | Merge pull request #15951 from pcreux/fix-mysql-test-fk | Godfrey Chan | 2014-06-27 | 1 | -1/+4 |
|\ \ | | | | | | | MySQL doesn't work with foreign keys | ||||
| * | | MySQL doesn't work with foreign keys | Philippe Creux | 2014-06-27 | 1 | -1/+4 |
|/ / | | | | | | | | | | | This was previously fixed in e84799d but broken in 3f596f8. This commit reintroduced the conditional that prevents the foreign keys from being added to MySQL databases. | ||||
* | | Merge pull request #15949 from pcreux/fix-add-foreign-key-in-test | Godfrey Chan | 2014-06-27 | 1 | -1/+1 |
|\ \ | | | | | | | Fix test with `add_foreign_key` DSL | ||||
| * | | Fix test with add_foreign_key DSL in 9d21ef9 | Philippe Creux | 2014-06-27 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #15934 from seuros/rename | Rafael Mendonça França | 2014-06-27 | 3 | -3/+17 |
|\ \ | | | | | | | | | | rename primary key sequence only if it exists | ||||
| * | | rename sequence only if it exists | Abdelkader Boudih | 2014-06-27 | 3 | -3/+17 |
| | | | |||||
* | | | Merge pull request #15943 from wagenet/cache-instrumentation | Rafael Mendonça França | 2014-06-27 | 2 | -11/+17 |
|\ \ \ | | | | | | | | | | | | | Always instrument ActiveSupport::Cache | ||||
| * | | | Always instrument ActiveSupport::Cache | Peter Wagenet | 2014-06-27 | 1 | -11/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current approach is broken because it uses a thread local value which means on multi-threaded environments it has to be turned on per thread. Secondly, ActiveSupport::Notifications does not instrument items when there are not subscribers so this flag is unnecessary. | ||||
* | | | | Merge pull request #15933 from rafael/master | Rafael Mendonça França | 2014-06-27 | 6 | -5/+99 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add always permitted parameters as a configurable option. [Rafael Mendonça França + Gary S. Weaver] | ||||
| * | | | | Improvements per code review. | Rafael Chacón | 2014-06-27 | 4 | -5/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * General style fixes. * Add changes to configuration guide. * Add missing tests. | ||||
| * | | | | Add always_permitted_parameters as an option. | Rafael Chacón | 2014-06-26 | 3 | -5/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This commit adds back the always_permitted_parameters configuration option to strong paramaters. * The initial pull requests where this feature was added are the following: - https://github.com/rails/rails/pull/12682 - https://github.com/rails/strong_parameters/pull/174 | ||||
* | | | | | Merge pull request #15946 from jamesprior/patch-1 | Rafael Mendonça França | 2014-06-27 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Update documentation for run_callbacks | ||||
| * | | | | | Update documentation for run_callbacks | jamesprior | 2014-06-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | In some cases run_callbacks will return nil. I'm attempting to update the documentation for the method to clarify. | ||||
* | | | | | | Do not change the global state of the test suite | Rafael Mendonça França | 2014-06-27 | 2 | -18/+2 |
|/ / / / / | |||||
* | | | | | Improve tests to use add_foreign_key DSL | Rafael Mendonça França | 2014-06-27 | 1 | -18/+11 |
| | | | | | |||||
* | | | | | MySQL doesn't works with foreign key | Rafael Mendonça França | 2014-06-27 | 1 | -3/+2 |
| | | | | | |||||
* | | | | | We are talking about the libraries, not the constants | Sean Griffin | 2014-06-27 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Note that `_will_change!` is no longer needed for AR instances | Sean Griffin | 2014-06-27 | 1 | -3/+5 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Leave the note for `ActiveModel`, since it can't yet detect mutations (hopefully we can change this in time for 4.2). However, we now detect mutations on all supported types in `ActiveRecord`, so we can note that `_will_change!` is no longer needed there. | ||||
* | | | | Talk about config.assts.version move too | Rafael Mendonça França | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Closes #15942 | ||||
* | | | | Merge pull request #12450 from iantropov/master | Rafael Mendonça França | 2014-06-27 | 5 | -5/+59 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug, when ':dependent => :destroy' violates foreign key constraints Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/has_one.rb | ||||
| * | | | | Fix bug, when ':dependent => :destroy' option violates foreign key ↵ | Ivan Antropov | 2013-10-26 | 5 | -9/+61 |
| | | | | | | | | | | | | | | | | | | | | constraints, issue #12380 | ||||
* | | | | | Merge pull request #15788 from sgrif/sg-mutable-strings | Rafael Mendonça França | 2014-06-27 | 5 | -13/+77 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Detect in-place modifications on Strings | ||||
| * | | | | | Detect in-place modifications on Strings | Sean Griffin | 2014-06-17 | 4 | -13/+55 |
| | | | | | | |||||
* | | | | | | Merge pull request #8639 from bogdan/valid-with-bang | Rafael Mendonça França | 2014-06-27 | 3 | -1/+36 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add AR::Base#valid! method | ||||
| * | | | | | | Add AR::Base#validate! method | Bogdan Gusiev | 2014-06-23 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acts same as valid? but raises AR::RecordInvalid exception if validation fails | ||||
* | | | | | | | Merge pull request #15940 from DNNX/databases-rake-refactoring | Rafael Mendonça França | 2014-06-27 | 4 | -31/+52 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | databases.rake refactoring | ||||
| * | | | | | | | Use AR::SchemaMigration.table_exists? call instead of longish AR::Base...etc,etc | Viktar Basharymau | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Extract AR::SchemaMigration.normalized_versions method | Viktar Basharymau | 2014-06-27 | 2 | -2/+5 |
| | | | | | | | | |||||
| * | | | | | | | Add a test for db:migrate:status to check missing file scenario | Viktar Basharymau | 2014-06-27 | 1 | -0/+15 |
| | | | | | | | | |||||
| * | | | | | | | db:migrate:status refactoring: Rewrite hand-crafted SQL query with ↵ | Viktar Basharymau | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord#pluck | ||||
| * | | | | | | | Use Array#flat_map and Array#grep in db:migrate:status task | Viktar Basharymau | 2014-06-27 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows the code to be more declarative and elegant. | ||||
| * | | | | | | | Add explaining variables to db:migrate:status | Viktar Basharymau | 2014-06-27 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Replace String index juggling with Pathname goodness in db:fixtures:load | Viktar Basharymau | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | db:fixtures:load refactoring: remove unnecessary loop | Viktar Basharymau | 2014-06-27 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::FixtureSet.create_fixtures` can accept an array of fixture_files. | ||||
| * | | | | | | | Extract `fixture_files` variable in fixtures:load rake task | Viktar Basharymau | 2014-06-27 | 1 | -1/+7 |
| | | | | | | | | |||||
| * | | | | | | | Replace a bit of cryptic code in fixtures:load rake task with plain stupid Ruby | Viktar Basharymau | 2014-06-27 | 1 | -1/+5 |
| | | | | | | | | |||||
| * | | | | | | | Get rid of duplication in db:fixtures:{identify,load} | Viktar Basharymau | 2014-06-27 | 2 | -12/+7 |
| | | | | | | | | |||||
| * | | | | | | | db:fixtures:{identify,load} tasks respect AR::Tasks::DatabaseTasks.root | Viktar Basharymau | 2014-06-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, if `ENV['FIXTURES_PATH']` was set, then `Rails.root` was used, otherwise the app used `ActiveRecord::Tasks::DatabaseTasks.root`. Now it is consistent. | ||||
| * | | | | | | | Simplify complex code in databases.rake | Viktar Basharymau | 2014-06-27 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #15938 from sgrif/sg-stop-instance-execing | Rafael Mendonça França | 2014-06-27 | 3 | -17/+38 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Stop using instance exec for type decorators |