| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix race condition in test | Jon Leighton | 2013-03-09 | 1 | -2/+2 |
| | | | | | | | | | | | | This should fix travis. For real this time! This is the one! The readpartial(100) meant that an earlier assert_stdout could chomp up the output that a later assert_stdout wants, meaning that the later assertion fails. Reading only 1 byte at a time ensure that we don't read any more than is necessary to verify the assertion. | ||||
| * | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]. | Yves Senn | 2013-03-09 | 1 | -7/+7 |
| | | |||||
| * | Bump up timeouts | Jon Leighton | 2013-03-09 | 1 | -3/+3 |
| | | | | | | | This should fix travis. Also ensuring that we don't try to kill when pid is nil. | ||||
| * | Renumbering the comments in the application boot process. | wangjohn | 2013-03-09 | 1 | -4/+4 |
| | | |||||
| * | Remove extra whitespace and fix a comment | Agis Anastasopoulos | 2013-03-09 | 1 | -2/+2 |
| | | | | minor comment fix for consistency | ||||
| * | Fix failing test regarding console change to fix sandboxing | Carlos Antonio da Silva | 2013-03-08 | 1 | -11/+10 |
| | | | | | Introduced in be3e10cd26bc8ec29c6474d03a08a8e733108e7d. | ||||
| * | Merge pull request #8670 from sanemat/fix/rake-desc | Vijay Dev | 2013-03-08 | 1 | -0/+2 |
| |\ | | | | | Add rake test description | ||||
| | * | Add rake test description | sanemat | 2013-01-01 | 1 | -0/+2 |
| | | | | | | | | | No behavior change | ||||
| * | | The console --sandbox transaction should not be joinable | Jon Leighton | 2013-03-08 | 1 | -10/+8 |
| | | | | | | | | | Thanks @neerajdotname for noticing this bug. | ||||
| * | | Fix rails console --sandbox | Jon Leighton | 2013-03-08 | 2 | -9/+77 |
| | | | | | | | | | | | | | I've also added a proper acceptance test which reproduced the issue. Closes #9513, #9515. | ||||
| * | | add prompt to 422 page to check logs | Nihad Abbasov | 2013-03-04 | 1 | -2/+3 |
| | | | |||||
| * | | Bring config.allow_concurrency back | José Valim | 2013-03-03 | 3 | -19/+48 |
| | | | | | | | | | | | Since the Rack::Lock still exists in development, let's provide a way to disable it explicitly. | ||||
| * | | Merge pull request #9512 from Jacke/master | Guillermo Iguaran | 2013-03-02 | 4 | -33/+127 |
| |\ \ | | | | | | | New 404, 422, 500 pages, they are more stylish and bring ruby essence… | ||||
| | * | | New beauty pages(404, 422, 500) | Stanislav | 2013-03-02 | 4 | -33/+127 |
| | | | | | | | | | | | | | | | | | | | moving changelog note to unreleased section New beauty pages(404, 422, 500) | ||||
| * | | | Remove hard coded references to Active Record in railties | José Valim | 2013-03-02 | 2 | -19/+7 |
| | | | | |||||
| * | | | :scissors: extra blank line | Akira Matsuda | 2013-03-02 | 1 | -1/+0 |
| |/ / | |||||
| * | | Support creating a table migration generator | Sammy Larbi | 2013-03-01 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes you want to create a table without an associated model and test, which is also not a join table. With this commit, you can now do that. Example: rails g migration create_posts title:string or rails g migration CreatePosts title:string This commit also moves the template the model generator uses for the migration to the migration templates folder, as it seems a more sensible place for it now that it is shared code. | ||||
| * | | Ensure plugins generated with plugin new can boot the dummy application | José Valim | 2013-02-28 | 6 | -53/+51 |
| | | | |||||
| * | | There's no need to access Railties through self.class | Santiago Pastorino | 2013-02-27 | 1 | -1/+2 |
| | | | | | | | | | Closes #9386 | ||||
| * | | Merge pull request #9442 from czarneckid/adjust-generator-language | Xavier Noria | 2013-02-26 | 1 | -1/+1 |
| |\ \ | | | | | | | Use less hyperbole in the language re: allowed parameters | ||||
| | * | | Use less hyperbole in the language re: allowed parameters | David Czarnecki | 2013-02-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update CHANGELOGS | Rafael Mendonça França | 2013-02-26 | 1 | -0/+3 |
| |/ / | |||||
| * | | Merge pull request #9419 from banyan/change-default-root-route-helper | Guillermo Iguaran | 2013-02-25 | 2 | -2/+2 |
| |\ \ | | | | | | | Change default root route helper | ||||
| | * | | Change default root route helper | Kohei Hasegawa | 2013-02-26 | 2 | -2/+2 |
| | | | | |||||
| * | | | Apparently we can't get away from adding lib to the load path | José Valim | 2013-02-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | Plugins can use a similar bootscript to Rails apps | José Valim | 2013-02-25 | 1 | -8/+3 |
| | | | | |||||
| * | | | Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile | Guillermo Iguaran | 2013-02-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Remove sprockets-rails from the Gemfile generator | robertomiranda | 2013-02-25 | 1 | -1/+0 |
| |/ / | |||||
| * | | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 2 | -2/+2 |
| | | | |||||
| * | | Revert "Use sass compressor as the default CSS compressor" | Guillermo Iguaran | 2013-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This reverts commit 3eef1c7c5d0c4538efb9e061b6fe68011f0352b1. The css compressor should be set in sass-rails plugin. Check https://github.com/rails/sass-rails/commit/339529f9f6433047df6358c0439e6641cb74f045 for the fix. | ||||
| * | | Use sass compressor as the default CSS compressor | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | With the new sprockets-rails we need to explicitly set the CSS compressor. See https://github.com/rails/sprockets-rails#changes-from-rails-3x | ||||
| * | | Improve `rake stats` for JavaScript and CoffeeScript. | Hendy Tanata | 2013-02-25 | 4 | -46/+394 |
| | | | | | | | | | Ignore block comments and calculates number of functions. | ||||
| * | | Merge pull request #9401 from sikachu/master-remove-builder-option | Rafael Mendonça França | 2013-02-24 | 12 | -183/+7 |
| |\ \ | | | | | | | Remove `--builder` option from `rails` command | ||||
| | * | | Remove `--builder` option from `rails` command | Prem Sichanugrist | 2013-02-24 | 12 | -183/+7 |
| | | | | | | | | | | | | | | | | | | | | | | Ability to use a custom builder by passing `--builder` (or `-b`) has been removed. Consider using application template instead. See this guide for more detail: http://guides.rubyonrails.org/rails_application_templates.html | ||||
| * | | | Merge pull request #9400 from senny/remove_auto_explain_threshold_in_seconds | Xavier Noria | 2013-02-24 | 3 | -19/+0 |
| |\ \ \ | | | | | | | | | remove config.auto_explain_threshold_in_seconds | ||||
| | * | | | remove AR auto-explain (config.auto_explain_threshold_in_seconds) | Yves Senn | 2013-02-24 | 3 | -19/+0 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | We discussed that the auto explain feature is rarely used. This PR removes only the automatic explain. You can still display the explain output for any given relation using `ActiveRecord::Relation#explain`. As a side-effect this should also fix the connection problem during asset compilation (#9385). The auto explain initializer in the `ActiveRecord::Railtie` forced a connection. | ||||
| * / / | Use sprockets-rails 2.0.0.rc3 in new apps | Guillermo Iguaran | 2013-02-24 | 1 | -1/+1 |
| |/ / | |||||
| * | | Revert "move config.assets.precompile into config/application.rb" | Yves Senn | 2013-02-24 | 3 | -10/+6 |
| | | | | | | | | | | | | | | | This reverts commit 304f4d4c25ccabdbf97d37dd7a92a54d0b63a9c9. As it turns out everything should behave as it did and we don't need to move this configuration option. | ||||
| * | | guides/rails_guides moved up and out of the railties directory | Sam Ruby | 2013-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | Fix backwards compatibility with Rails 3 apps. | Steve Klabnik | 2013-02-22 | 3 | -40/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we removed script/rails and introduced bin/rails, we accidentally introduced a regression. If you install Rails 4 as a gem, then try to do something in a Rails 3 application: $ rails g This will throw the 'please type rails new foo' message rather than the proper generator documentation message. This is because older apps don't have bin/rails. Therefore, we now *prefer* bin/rails, but still search for script/rails, and exec the one we find. | ||||
| * | | Update railties/lib/rails/application/configuration.rb | iwiznia | 2013-02-21 | 1 | -3/+3 |
| | | | | | | | Better comment for database_configuration method | ||||
| * | | Update railties/lib/rails/application/configuration.rb | iwiznia | 2013-02-21 | 1 | -1/+1 |
| | | | | | | | Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"] | ||||
| * | | remove uncommented railties boot_test.rb | Yves Senn | 2013-02-21 | 1 | -20/+0 |
| | | | |||||
| * | | Merge pull request #9341 from senny/move_precompiled_asset_config_to_application | Rafael Mendonça França | 2013-02-20 | 3 | -6/+10 |
| |\ \ | | | | | | | move config.assets.precompile into config/application.rb | ||||
| | * | | move config.assets.precompile into config/application.rb | Yves Senn | 2013-02-20 | 3 | -6/+10 |
| | | | | |||||
| * | | | update changelog | Terence Lee | 2013-02-21 | 1 | -0/+3 |
| | | | | |||||
| * | | | run the load_structure test in the test environment | Terence Lee | 2013-02-21 | 1 | -3/+10 |
| | | | | |||||
| * | | | test DATABASE_URL without database.yml around | Terence Lee | 2013-02-21 | 1 | -0/+2 |
| | | | | |||||
| * | | | standardize database_configuration to a hash | Terence Lee | 2013-02-21 | 1 | -2/+6 |
| |/ / | | | | | | | | | | | | | make connection_url_to_hash a class method This als prevents loading database.yml if it doesn't exist but DATABASE_URL does | ||||
| * | | Better not use tab chars in the generator template | Akira Matsuda | 2013-02-20 | 1 | -5/+5 |
| | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |