Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1403 from bogdan/config | José Valim | 2011-05-31 | 3 | -12/+48 |
|\ | | | | | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method | ||||
| * | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method | Bogdan Gusiev | 2011-05-30 | 3 | -12/+48 |
| | | | | | | | | | | In order to specify your own sanitize method Implemented .mass_assignment_sanitizer configuration option | ||||
* | | Merge pull request #1415 from brainopia/master | José Valim | 2011-05-30 | 1 | -5/+0 |
|\ \ | | | | | | | Remove autoload for non-existing constants | ||||
| * | | Remove autoload for a couple of constants which don't exist anymore | brainopia | 2011-05-31 | 1 | -5/+0 |
|/ / | |||||
* | | Merge pull request #1410 from lucasts/pg_schema | Aaron Patterson | 2011-05-30 | 1 | -5/+11 |
|\ \ | | | | | | | a little step to better postgresql schema support in rails | ||||
| * | | [activerecord][postgresql] verify if table has a schema(not public) | Lucas Stephanou | 2011-05-27 | 1 | -6/+5 |
| | | | |||||
| * | | find sequences with pg schemas properly | Lucas Stephanou | 2011-05-27 | 1 | -4/+11 |
| | | | |||||
* | | | Merge pull request #1404 from ↵ | José Valim | 2011-05-30 | 3 | -1/+27 |
|\ \ \ | | | | | | | | | | | | | | | | | commuter/plugin_new_generator_should_properly_require_js properly require javascript libraries when generating mountable engine | ||||
| * | | | properly require javascript libraries when generating mountable engine | J. Edward Dewyea | 2011-05-30 | 3 | -1/+27 |
| | |/ | |/| | |||||
* | | | Merge pull request #1355 from gnufied/master | Joshua Peek | 2011-05-30 | 1 | -0/+8 |
|\ \ \ | |/ / |/| | | Adds rake task to cleanup compiled assets | ||||
| * | | refectored assets:clean task | Vishnu Atrai | 2011-05-30 | 1 | -3/+1 |
| | | | |||||
| * | | rename task and Rake::FileList used | Vishnu Atrai | 2011-05-27 | 1 | -3/+3 |
| | | | |||||
| * | | Add rake task to implement assets:cleanup, fixes Github Issues # 1284 | Bhavin Kamani | 2011-05-27 | 1 | -0/+10 |
| |/ | |||||
* | | avoid creating range objects | Aaron Patterson | 2011-05-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1398 from leereilly/my_new_branch | Aaron Patterson | 2011-05-29 | 6 | -10/+10 |
|\ \ | | | | | | | Corrected some typos and American vs. Queen's English issues | ||||
| * | | Corrected some typos and American vs. Queen's English issues | Lee Reilly | 2011-05-29 | 6 | -10/+10 |
|/ / | |||||
* | | Merge pull request #1384 from amatsuda/simplify_drop_table | Aaron Patterson | 2011-05-28 | 3 | -10/+2 |
|\ \ | | | | | | | Remove unused options from drop_table | ||||
| * | | No need to pass options which is never used | Akira Matsuda | 2011-05-29 | 1 | -2/+2 |
| | | | |||||
| * | | No need to override for just calling super | Akira Matsuda | 2011-05-29 | 2 | -8/+0 |
| | | | |||||
* | | | Merge pull request #1380 from vijaydev/session_migration | José Valim | 2011-05-28 | 1 | -5/+1 |
|\ \ \ | | | | | | | | | Use 3.1 style migration for sessions table | ||||
| * | | | Use change in place of up and down in sessions table migration | Vijay Dev | 2011-05-28 | 1 | -5/+1 |
| |/ / | |||||
* | | | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests | José Valim | 2011-05-28 | 2 | -0/+29 |
|\ \ \ | |/ / |/| | | Stringify param values in controller tests. | ||||
| * | | use to_param (and change method to name accordingly) | David Chelimsky | 2011-05-22 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing? | ||||
| * | | Stringify param values in controller tests. | David Chelimsky | 2011-05-22 | 2 | -0/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach | ||||
* | | | Merge pull request #1378 from AndrewRadev/master | José Valim | 2011-05-28 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Add changelog entry for pull request #1359 | ||||
| * | | | ActiveSupport CHANGELOG entry moved to correct place | Andrew Radev | 2011-05-28 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update CHANGELOG for ActiveSupport::OrderedHash change | Andrew Radev | 2011-05-28 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #1373 from anbotero/master | José Valim | 2011-05-28 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Minor typo corrected | ||||
| * | | | | Fix typo in test. | Andrés Botero | 2011-05-28 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1372 from jacott/master | José Valim | 2011-05-27 | 3 | -11/+13 |
|\ \ \ \ | | | | | | | | | | | Fix for relative_url_root when used with sprockets | ||||
| * | | | | fixed asset_paths when called from sprockets for relative_url_root | jacott | 2011-05-28 | 3 | -11/+13 |
| | | | | | |||||
* | | | | | Merge pull request #1371 from FLOChip/typo | Xavier Noria | 2011-05-27 | 1 | -9/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | | Typo in ActionMailer::Base | ||||
| * | | | | minor typo in the rdoc about Interceptor. | Teng Siong Ong | 2011-05-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | minor spacing fix in code example in ActionMailer::Base. | Teng Siong Ong | 2011-05-28 | 1 | -8/+8 |
|/ / / / | |||||
* | | | | Merge pull request #1368 from amatsuda/disable_im_by_default_on_test | Aaron Patterson | 2011-05-27 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Disable IdentityMap by default for ActiveRecord testing | ||||
| * | | | | Disable IdentityMap by default for ActiveRecord testing | Akira Matsuda | 2011-05-28 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | because enabling IM by default will possibly hide some bugs on 3.1 default behavior | ||||
* | | | | stop using boolean expressions because of the side effects | Aaron Patterson | 2011-05-27 | 1 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #1365 from gnufied/sqlite3 | Aaron Patterson | 2011-05-27 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | close statment only if its not closed | ||||
| * | | | | delegate connection and column_hash calls directly to model | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | close statment only if its not closed | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1229 from workmad3/master | Aaron Patterson | 2011-05-27 | 2 | -2/+16 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix for Issue #1205 | ||||
| * | | | | Added a test to check for correct behaviour with no options in add_index ↵ | David Workman | 2011-05-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | command recorder | ||||
| * | | | | Using .try to test for the existence of a method option in a nil-resistent ↵ | David Workman | 2011-05-23 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat | ||||
| * | | | | Neatened up the invert_add_index method as per suggeston | David Workman | 2011-05-23 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Simple fix for correctly inverting an add_index migration when a name has ↵ | David Workman | 2011-05-23 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | been provided | ||||
* | | | | | work around bug in the sqlite3 bindings. fixes #1289 | Aaron Patterson | 2011-05-27 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1346 from arunagw/jdom_file_from_xml_fix | Aaron Patterson | 2011-05-27 | 2 | -15/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | Jdom file from xml fix | ||||
| * | | | | | Adding tests for file_from_xml for XmlMini_JDOM #jruby | Arun Agrawal | 2011-05-27 | 1 | -14/+14 |
| | | | | | | |||||
| * | | | | | Adding __content__ into XmlMini_JDOM | Arun Agrawal | 2011-05-27 | 1 | -1/+8 |
| | | | | | | |||||
* | | | | | | fixing test for mysql2 | Aaron Patterson | 2011-05-27 | 1 | -5/+2 |
| | | | | | |