Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into railstest | Aaron Patterson | 2013-04-05 | 8 | -16/+40 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) Improve the changelog entry [ci skip] Fix explicit names on multiple file fields Correctly parse bigint defaults in PostgreSQL Move changelog to the top [ci skip] Fix indent and remove extra white spaces Fix scope chaining + STI failing test for #9869 Improve `belongs_to touch: true` timestamp test Sort modules in alphabetical order. Avoid an attempt to fetch old record when id was not present in touch callback Use the correct pk field from the reflected class to find the old record Refactor mail_to to not generate intermediate hashes when adding href Ensure mail_to helper does not modify the given html options hash Use inspect when writing the foreign key from the reflection Use a space after the comment sign when showing the result of commands Exclude template files for rdoc API [ci skip] template should have generic name use | to have more intent revealing code Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters" stop depending on callbacks ... Conflicts: railties/test/application/rake_test.rb | ||||
| * | Merge pull request #10092 from amco/master | Carlos Antonio da Silva | 2013-04-04 | 1 | -10/+16 |
| |\ | | | | | | | Model generator USAGE doc improvement | ||||
| | * | Model generator USAGE doc improved | Jason King | 2013-04-04 | 1 | -10/+16 |
| | | | | | | | | | | | | | | | | | | * Added information about syntax for precision/scale of decimals * Removed incorrect information about being able to set `default` * Added more examples of usage | ||||
| * | | Exclude template files for rdoc API [ci skip] | Francesco Rodriguez | 2013-04-04 | 1 | -1/+2 |
| | | | |||||
| * | | fix private attribute warning | Vipul A M | 2013-04-04 | 2 | -3/+6 |
| |/ | |||||
| * | fix warnings in railties test | Vipul A M | 2013-04-04 | 1 | -3/+3 |
| | | |||||
| * | Merge pull request #10080 from vipulnsward/railties_warning_fix_v2 | Steve Klabnik | 2013-04-03 | 1 | -1/+1 |
| |\ | | | | | | | add require to suppress warning; remove variable | ||||
| | * | add require to suppress warning; remove variable | Vipul A M | 2013-04-04 | 1 | -1/+1 |
| | | | |||||
| * | | Fix some railties test warnings | Vipul A M | 2013-04-03 | 1 | -1/+1 |
| |/ | |||||
* | | do not blow away the test database on every run | Aaron Patterson | 2013-04-05 | 1 | -10/+0 |
| | | |||||
* | | check pending migrations against the test db | Aaron Patterson | 2013-04-03 | 1 | -15/+1 |
| | | |||||
* | | only match the default task | Aaron Patterson | 2013-04-03 | 1 | -1/+1 |
| | | |||||
* | | test no longer makes sense after requiring all test files | Aaron Patterson | 2013-04-03 | 1 | -23/+1 |
| | | |||||
* | | switch the testing tests to use rake | Aaron Patterson | 2013-04-03 | 1 | -20/+23 |
| | | |||||
* | | a test file can be provided to rake, e.g.: | Aaron Patterson | 2013-04-03 | 1 | -1/+10 |
| | | | | | | | | rake test path/to/test.rb | ||||
* | | switch to Rails::TestTask | Aaron Patterson | 2013-04-03 | 2 | -25/+34 |
| | | |||||
* | | default task should also be in the test env | Aaron Patterson | 2013-04-03 | 1 | -1/+1 |
| | | |||||
* | | Revert "Update Rake tasks to call `rails test` instead" | Aaron Patterson | 2013-04-03 | 2 | -41/+62 |
| | | | | | | | | This reverts commit b51673fbd9563bd3ffa22e22255ca1cef80cfb6d. | ||||
* | | Revert "Warning removed unused variable task_name" | Aaron Patterson | 2013-04-03 | 1 | -0/+1 |
| | | | | | | | | This reverts commit 106e15927f0dd8060fc37eff44b823a92fa94bd2. | ||||
* | | apps that depend on active record should load fixtures | Aaron Patterson | 2013-04-03 | 2 | -10/+2 |
|/ | |||||
* | Merge pull request #10074 from ↵ | Rafael Mendonça França | 2013-04-03 | 2 | -2/+0 |
|\ | | | | | | | | | trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1 | ||||
| * | Remove comments about removing LegacyKeyGenerator in 4.1 | Trevor Turk | 2013-04-03 | 2 | -2/+0 |
| | | |||||
* | | Avoid running bundler on tests that don't need it | Sam Ruby | 2013-04-03 | 1 | -1/+4 |
| | | |||||
* | | Getting rid of a few other vestiges of rails.png. | Steve Klabnik | 2013-04-02 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides. | ||||
* | | CHANGELOG entry for rails.png removal. | Steve Klabnik | 2013-04-02 | 1 | -0/+5 |
| | | |||||
* | | We don't need to remove index.html any more. | Steve Klabnik | 2013-04-02 | 1 | -1/+0 |
| | | | | | | | | | | Since it's not a real file any longer, no need to worry about removing it when we reset the dummy. | ||||
* | | .gitkeep -> .keep | Steve Klabnik | 2013-04-02 | 1 | -0/+0 |
|/ | | | | Mentioned in a comment in e90c2d029edc by @frodsan. | ||||
* | Rename DummyKeyGenerator -> LegacyKeyGenerator | Trevor Turk | 2013-04-02 | 2 | -4/+4 |
| | |||||
* | Fix tests from rails.png removal. | Jessica Lynn Suttles | 2013-04-02 | 1 | -1/+8 |
| | | | | | I'm giving @jlsuttles credit on this commit because she gave me the idea and the actual converted image in 952289aabfb. | ||||
* | adding .gigkeep to default app/assets/images | Steve Klabnik | 2013-04-02 | 1 | -0/+0 |
| | |||||
* | Remove rails.png. | Steve Klabnik | 2013-04-02 | 2 | -1/+1 |
| | | | | | | | No reason to have a file, we've got data-URIs now! It didn't make sense to me that you no longer have to remove public/index.html, but you still need to remove rails.png. This means that you won't have to any more when making a new Rails app. | ||||
* | Merge pull request #3782 from arunagw/warning_mode_on | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 |
|\ | | | | | Turning on warnings in "rake test" for railties | ||||
| * | Turning on warnings in "rake test" for railties | Arun Agrawal | 2013-04-01 | 1 | -1/+1 |
| | | |||||
* | | Revert "Use jquery-rails from github" | Santiago Pastorino | 2013-04-02 | 1 | -3/+1 |
| | | | | | | | | | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb | ||||
* | | Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184a | Santiago Pastorino | 2013-04-01 | 1 | -4/+4 |
| | | |||||
* | | Revert more Rails.version changes | Rafael Mendonça França | 2013-04-01 | 4 | -5/+5 |
| | | | | | | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc | ||||
* | | :scissors: | Rafael Mendonça França | 2013-04-01 | 1 | -4/+4 |
| | | | | | | | | [ci skip] | ||||
* | | Remove CHANGELOG entry for #10002 | Rafael Mendonça França | 2013-04-01 | 1 | -4/+0 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #10002 from charliesome/revert-version-method-on-rails | Jeremy Kemper | 2013-04-01 | 2 | -7/+10 |
|\ \ | | | | | | | Reverts changes to Rails.version made in #8501 | ||||
| * | | reverts changes to Rails.version made in #8501 | Charlie Somerville | 2013-03-30 | 2 | -7/+10 |
| | | | |||||
* | | | Move the class methods to above the protected section | Rafael Mendonça França | 2013-04-01 | 3 | -47/+36 |
| | | | |||||
* | | | Merge pull request #10021 from pabloh/refactor_rails_generator_test_case | Rafael Mendonça França | 2013-04-01 | 4 | -211/+259 |
|\ \ \ | | | | | | | | | | | | | Refactor Rails::Generator::TestCase into modules | ||||
| * | | | Break down Rails::Generator::TestCase into modules | Pablo Herrero | 2013-03-31 | 4 | -211/+259 |
| | |/ | |/| | |||||
* | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade | Santiago Pastorino | 2013-04-01 | 4 | -16/+69 |
|\ \ \ | |/ / |/| | | Cookie-base session store auto-upgrade | ||||
| * | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 4 | -16/+69 |
| | | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config | ||||
* | | | cleanup railties test; fix typos | Vipul A M | 2013-03-31 | 3 | -6/+5 |
| | | | |||||
* | | | Make comment about uglifier in generated Gemfile consistent between branches | Carlos Antonio da Silva | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393. | ||||
* | | | Merge pull request #9991 from Passionate/patch-1 | Rafael Mendonça França | 2013-03-30 | 1 | -18/+50 |
|\ \ \ | | | | | | | | | improve readability | ||||
| * | | | improve readability | Paritosh Piplewar | 2013-03-29 | 1 | -18/+50 |
| | | | | |||||
* | | | | Use last released version of thor | Guillermo Iguaran | 2013-03-30 | 1 | -1/+1 |
| | | | |