Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6976 from vitorbal/master | Carlos Antonio da Silva | 2012-07-05 | 1 | -1/+3 |
|\ | | | | | Add documentation for inheritance_column method [ci skip] | ||||
| * | Add documentation for inheritance_column method | Vitor Balocco | 2012-07-05 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #6957 from francois2metz/options_method | Carlos Antonio da Silva | 2012-07-05 | 2 | -2/+12 |
|\ | | | | | Add the options method to action_controller testcase. | ||||
| * | Add the options method to action_controller testcase. | François de Metz | 2012-07-04 | 2 | -2/+12 |
| | | | | | | | | Signed-off-by: François de Metz <francois@stormz.me> | ||||
* | | Merge pull request #6959 from robin850/patch-1 | José Valim | 2012-07-05 | 1 | -0/+49 |
|\ \ | | | | | | | Add few information on the field types | ||||
| * | | Add few information on the field types | Robin Dupret | 2012-07-04 | 1 | -0/+49 |
| |/ | |||||
* | | Merge pull request #6967 from frodsan/quite_as_duration | Rafael Mendonça França | 2012-07-05 | 3 | -1/+15 |
|\ \ | | | | | | | fix quoting for ActiveSupport::Duration instances | ||||
| * | | fix quoting for ActiveSupport::Duration instances | Francesco Rodriguez | 2012-07-04 | 3 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes quoting for ActiveSupport::Duration instances: # before >> ActiveRecord::Base.connection.quote 30.minutes => "'--- 1800\n...\n'" # after >> ActiveRecord::Base.connection.quote 30.minutes => "1800" Also, adds a test for type casting ActiveSupport::Duration instances. Related to #1119. | ||||
* | | | Merge pull request #6969 from mkdynamic/patch-1 | Jeremy Kemper | 2012-07-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use ArgumentError vs. RuntimeError, which is more precise | ||||
| * | | | Use ArgumentError vs. RuntimeError, which is more precise. | Mark Dodwell | 2012-07-04 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #6968 from guilleiguaran/update-test-helper | Rafael Mendonça França | 2012-07-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that | ||||
| * | | | CSV fixtures aren't supported by default anymore, update generated ↵ | Guillermo Iguaran | 2012-07-04 | 1 | -1/+1 |
|/ / / | | | | | | | | | | test_helper.rb to reflect that | ||||
* / / | activesupport gem dependencies should reflect the versions we actually use | Aaron Patterson | 2012-07-04 | 3 | -1/+2 |
|/ / | |||||
* | | Merge pull request #6961 from frodsan/fix_release_note | Santiago Pastorino | 2012-07-04 | 1 | -2/+2 |
|\ \ | |/ |/| | fix link and add activeresource link in release notes page [ci skip] | ||||
| * | fix link and add activeresource link in release notes page [ci skip] | Francesco Rodriguez | 2012-07-04 | 1 | -2/+2 |
|/ | |||||
* | Update 4.0 Release Notes | Rafael Mendonça França | 2012-07-04 | 1 | -1/+15 |
| | | | | Related with 17d2115e3df6caf15d554b44e28177069fa3ed5b | ||||
* | Kill not used constant since removal of runner method | Carlos Antonio da Silva | 2012-07-03 | 1 | -9/+0 |
| | | | | Runner method was removed in ada571bfcdbad669ae43a4dd18277ef227680a0b. | ||||
* | remove duplicate requires of mocha. | Aaron Patterson | 2012-07-03 | 3 | -4/+0 |
| | | | | | Mocha is already required by AS::TestCase, so remove the duplicate requires. | ||||
* | remove the runner method copied from minitest | Aaron Patterson | 2012-07-03 | 1 | -20/+7 |
| | |||||
* | hook mocha in through m/t before_setup, after_teardown hooks | Aaron Patterson | 2012-07-03 | 4 | -9/+26 |
| | |||||
* | Merge pull request #6948 from frodsan/plugin_skip_ignore | Rafael Mendonça França | 2012-07-03 | 2 | -1/+9 |
|\ | | | | | remove test/dummy from gitignore when "plugin new -T" | ||||
| * | remove test/dummy from gitignore when "plugin new -T" | Francesco Rodriguez | 2012-07-03 | 2 | -1/+9 |
| | | |||||
* | | Merge branch 'lexmag-reference_statements' | Rafael Mendonça França | 2012-07-03 | 8 | -40/+226 |
|\ \ | |/ |/| | | | Closes #6920 | ||||
| * | Don't need to use delete in the options hash | Rafael Mendonça França | 2012-07-03 | 2 | -3/+2 |
| | | |||||
| * | Add changelog entry for references statements | Aleksey Magusev | 2012-07-03 | 1 | -0/+13 |
| | | |||||
| * | Refactor references schema definitions | Aleksey Magusev | 2012-07-03 | 2 | -34/+24 |
| | | |||||
| * | Make references statements reversible | Aleksey Magusev | 2012-07-03 | 2 | -4/+40 |
| | | |||||
| * | Add references schema statements | Aleksey Magusev | 2012-07-03 | 3 | -1/+149 |
| | | | | | | | | | | | | | | | | | | | | Examples: add_reference :products, :supplier, polymorphic: true, index: true remove_reference :products, :user `add_belongs_to` and `remove_belongs_to` are acceptable. | ||||
* | | Merge pull request #6946 from threedaymonk/queue-refs | Aaron Patterson | 2012-07-03 | 3 | -45/+132 |
|\ \ | |/ |/| | Ensure that queued jobs are marshallable | ||||
| * | Make TestQueueTest work with marshalling queue | Paul Battley | 2012-07-03 | 1 | -25/+60 |
| | | | | | | | | | | This requires all jobs to be instances of named classes, without block implementations of methods. | ||||
| * | Ensure jobs do not refer to the queue | Paul Battley | 2012-07-03 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | Jobs pushed to the queue should not contain a reference to it. As the queue itself cannot be marshalled, and as a consequence of checking the marshallability of all jobs in the test environment, we can now guarantee this to be the case in the test environment when using the default TestQueue implementation. | ||||
| * | Ensure test jobs are marshallable | Paul Battley | 2012-07-03 | 2 | -8/+35 |
| | | | | | | | | | | | | | | | | | | | | By marshalling and unmarshalling jobs when adding them to the test queue, we can ensure that jobs created during test runs are valid candidates for marshalling, and, thus, that they can be used with queueing backends other than the default simple in-process implementation. This will also be used in a subsequent commit to ensure that jobs pushed to the queue do not contain a reference to the queue itself. | ||||
| * | Track queue threading with named classes | Paul Battley | 2012-07-03 | 1 | -14/+24 |
| | | | | | | | | | | | | | | Using an anonymous class prevented marshalling: we're not doing that yet, but the next commit will introduce this. This also provided an opportunity to improve the expressivity of the tests and to make the assertion failure messages clearer. | ||||
* | | Merge pull request #6940 from acapilleri/observer_update | Carlos Antonio da Silva | 2012-07-03 | 1 | -2/+1 |
|\ \ | |/ |/| | Observer #update refactoring | ||||
| * | observer update refactoring | Angelo Capilleri | 2012-07-03 | 1 | -2/+1 |
| | | |||||
* | | Merge pull request #6934 from kennyj/fix_store | Rafael Mendonça França | 2012-07-02 | 2 | -2/+10 |
|\ \ | | | | | | | Don't mark the store as changed if an attribute isn't changed. | ||||
| * | | Don't mark the store as changed if an attribute isn't changed. | kennyj | 2012-07-03 | 2 | -2/+10 |
|/ / | |||||
* | | Update 4.0 Release Notes with changelogs [ci skip] | Carlos Antonio da Silva | 2012-07-02 | 4 | -23/+230 |
| | | | | | | | | | | | | | | Also fix some wrong formatting. Related discussion: https://github.com/rails/rails/commit/ab72040b74f742b6676b2d2a5dd029bfdca25a7a#commitcomment-1525256 | ||||
* | | explains why the file update checker ignores mtimes in the future, plus a ↵ | Xavier Noria | 2012-07-02 | 1 | -2/+12 |
|/ | | | | little refactor for the same price | ||||
* | push response creation down since third param is never used. | Aaron Patterson | 2012-07-02 | 1 | -3/+3 |
| | |||||
* | Merge pull request #6919 from rahul100885/master | Carlos Antonio da Silva | 2012-07-02 | 1 | -1/+1 |
|\ | | | | | | | | | Make file name and class name consistant Related to dbc43bcce69aa4aaf0ae309bf410e2b786c4e3f6 | ||||
| * | Made file name and class name consistant | Rahul P. Chaudhari | 2012-07-02 | 1 | -1/+1 |
| | | |||||
* | | Improve performance of DateTime#seconds_since_unix_epoch | Andrew White | 2012-07-02 | 2 | -2/+6 |
|/ | | | | | | | | | | | | | | | | | | | Calculate the seconds since the UNIX epoch using the difference in Julian day numbers from the epoch date. By reducing the Rational math to just the offset component this gives a significant improvement. Benchmark: Calculating -------------------------------------------- new 27733 i/100ms current 15031 i/100ms new 27737 i/100ms current 15549 i/100ms -------------------------------------------------------- new 548182.1 (±0.9%) i/s - 2745567 in 5.008943s current 216380.9 (±1.6%) i/s - 1082232 in 5.002781s new 510281.9 (±1.2%) i/s - 2551804 in 5.001525s current 219858.3 (±1.8%) i/s - 1103979 in 5.023039s | ||||
* | Fix failing test related to persist glob when replacing a path | Carlos Antonio da Silva | 2012-07-01 | 1 | -1/+1 |
| | | | | Introduced in pull request #6910, merged in 2ee3fa1a48513a2c42833e2e1f60fe03769bc295 | ||||
* | Use strings for the table names | Rafael Mendonça França | 2012-07-01 | 1 | -1/+1 |
| | | | | connection.tables returns an array of strings | ||||
* | Revert "Use strftime to convert DateTime to numeric" | Andrew White | 2012-07-01 | 1 | -1/+2 |
| | | | | | | | There appears to be a bug with DateTime#strftime("%s") on 32-bit platforms. Bug report: http://bugs.ruby-lang.org/issues/6683 This reverts commit 210cd756a628cc19c0d6e44bee8c33dfb2d9d598. | ||||
* | Unify the collation API for the database adpters | Rafael Mendonça França | 2012-07-01 | 6 | -15/+15 |
| | |||||
* | Merge pull request #6914 from lexmag/migration_tests | Rafael Mendonça França | 2012-07-01 | 2 | -37/+11 |
|\ | | | | | Refactor migration test_helper | ||||
| * | Refactor migration test_helper | Aleksey Magusev | 2012-07-01 | 2 | -37/+11 |
| | | | | | | | | and create_join_table_test | ||||
* | | Merge pull request #6910 from mulder/fix_path_glob | José Valim | 2012-07-01 | 2 | -1/+9 |
|\ \ | | | | | | | Persist glob when replacing a path |