Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | typo | Xavier Noria | 2013-03-30 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | registers the new doc:rails behaviour in the changelog | Xavier Noria | 2013-03-30 | 1 | -0/+5 | |
| | | | | | ||||||
* | | | | | rdoc is no longer a gem dependency, sdoc becomes a runtime dependency | Xavier Noria | 2013-03-30 | 2 | -1/+5 | |
| | | | | | ||||||
* | | | | | unifies API generation | Xavier Noria | 2013-03-30 | 2 | -53/+34 | |
| | | | | | ||||||
* | | | | | moves RDOC_MAIN.rdoc to railties | Xavier Noria | 2013-03-30 | 2 | -1/+74 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal of these refactors is to have the same code generating edge and doc:rails APIs, and the rails gem is not available in LOAD_PATHS because it has no lib directory. | |||||
* | | | | | encapsulates API generation in Rails::API::Task | Xavier Noria | 2013-03-30 | 1 | -0/+122 | |
| |/ / / |/| | | | ||||||
* | | | | Update the call to Bundler.require in application.rb since assets group ↵ | Guillermo Iguaran | 2013-03-28 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | doesn't exist anymore in Gemfile | |||||
* | | | | Add better comments to assets gems | Guillermo Iguaran | 2013-03-28 | 1 | -9/+22 | |
| |/ / |/| | | ||||||
* | | | Fix typo | Prathamesh Sonpatki | 2013-03-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add coffee-rails and javascript runtime to gemfile if skip_javascript is | Rafael Mendonça França | 2013-03-28 | 1 | -2/+9 | |
| | | | | | | | | | | | | provided | |||||
* | | | Remove buggy and unnecessary logic | Sam Ruby | 2013-03-27 | 1 | -7/+0 | |
| | | | | | | | | | | | | based on a discussion with @rafaelfranca | |||||
* | | | Cosmetic cleanup of generated Gemfile | Sam Ruby | 2013-03-27 | 1 | -17/+14 | |
| | | | | | | | | | | | | | | | | | | - Remove obsolete/misleading comment about assets only being used production - Remove unnecessary group :assets - Eliminate blank lines if options[:skip_javascript] is not specified | |||||
* | | | s/and and run/and runs/ | David Chapman | 2013-03-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | Fixing some typos/grammar. | |||||
* | | | default RAILS_ENV to test if we're in a test task | Aaron Patterson | 2013-03-25 | 1 | -0/+4 | |
| | | | ||||||
* | | | Fixed typo in railties/test | Prathamesh Sonpatki | 2013-03-25 | 2 | -2/+2 | |
| | | | ||||||
* | | | Controller name pluralized | Prathamesh Sonpatki | 2013-03-25 | 1 | -2/+2 | |
| | | | ||||||
* | | | Fix jquery-as-default test to account for switch from gem to github source ↵ | Jeremy Kemper | 2013-03-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | in #9904 | |||||
* | | | Merge pull request #9909 from trevorturk/9740 | Jeremy Kemper | 2013-03-24 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | Transparently upgrade signed cookies when setting secret_key_base | |||||
| * | | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵ | Trevor Turk | 2013-03-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4 | |||||
* | | | | Put coffee-rails in top-level of generated Gemfile | Gabe Kopley | 2013-03-24 | 3 | -16/+43 | |
|/ / / | | | | | | | | | | v3 of pull request based on additional feedback from @jeremy | |||||
* | | | Use jquery-rails from github | Sam Ruby | 2013-03-24 | 1 | -1/+3 | |
| | | | | | | | | | | | | completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980 | |||||
* | | | Fix some typos | Vipul A M | 2013-03-24 | 3 | -3/+3 | |
| | | | ||||||
* | | | Fix test: ActiveSupport.version is returning now a Gem::Version instead of a ↵ | Guillermo Iguaran | 2013-03-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | String | |||||
* | | | Merge pull request #8501 from charliesome/version-to-s | Rafael Mendonça França | 2013-03-23 | 10 | -20/+21 | |
|\ \ \ | | | | | | | | | Add #to_s method to VERSION modules | |||||
| * | | | add changelog entry | Charlie Somerville | 2013-03-24 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | remove references to *::VERSION, replace with *.version | Charlie Somerville | 2013-03-21 | 8 | -14/+10 | |
| | | | | ||||||
| * | | | Add version method to top level modules | Charlie Somerville | 2013-03-21 | 1 | -6/+7 | |
| | |/ | |/| | ||||||
* | | | Better styles for the CSS [ci skip] | Rafael Mendonça França | 2013-03-23 | 3 | -38/+38 | |
| | | | ||||||
* | | | Don't kill the console | Jon Leighton | 2013-03-22 | 1 | -10/+2 | |
| | | | | | | | | | | | | | | | Use the "quit" command instead. This seems to prevents some weirdness on OS X. See #9761. | |||||
* | | | Send SIGTERM, not SIGQUIT. | Jon Leighton | 2013-03-22 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | SIGTERM is the correct signal for a graceful exit. This will hopefully resolve #9761. | |||||
* | | Don't generate a scaffold.css if no-assets | Kevin Glowacz | 2013-03-20 | 3 | -1/+6 | |
| | | ||||||
* | | fix sentence [ci skip] | Neeraj Singh | 2013-03-19 | 1 | -1/+1 | |
| | | ||||||
* | | Initialize @app_env_config now that the var name has changed | Carlos Antonio da Silva | 2013-03-19 | 1 | -1/+1 | |
| | | | | | | | | Check 862389c9537dbb6f65fd26c4325e07607ed437b5 for more background. | |||||
* | | Use @app_env_config instead of @env_config | José Valim | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | | | Check pull request #9789 for more information. | |||||
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" | Xavier Noria | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. | |||||
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779] | Xavier Noria | 2013-03-18 | 1 | -1/+1 | |
| | | ||||||
* | | More helpful message when starting server | Gabe Kopley | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | | | v2 of pull request based on feedback from @rafaelfranca, @schneems, and @carlosantoniodasilva | |||||
* | | config.ru uses the effective Rack app | Yves Senn | 2013-03-15 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | We used to pass the Rails::Application subclass to #run. The Rails server then called #to_app to convert that class to the actual Rack application. if you surround `#run` with a call to `#map` the server no longer convertes the class to the instance and we end up with unnecessary delegation calls on every request. | |||||
* | | Warning removed unused variable task_name | Arun Agrawal | 2013-03-15 | 1 | -1/+0 | |
| | | | | | | | | warning: assigned but unused variable - task_name | |||||
* | | Add support for generate scaffold password:digest | Sam Ruby | 2013-03-13 | 9 | -13/+82 | |
| | | | | | | | | | | | | | | | | | | | | * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password entirely from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture | |||||
* | | Move some railties changelog entries to the top [ci skip] | Carlos Antonio da Silva | 2013-03-13 | 1 | -20/+21 | |
| | | ||||||
* | | Stop calling "super" twice in Rails::Server#app | Carlos Antonio da Silva | 2013-03-12 | 1 | -1/+4 | |
| | | | | | | | | Cache the value of "super" in a variable and use it instead. | |||||
* | | Replace assert_(no_)match args from regexps to strings to remove warnings | Carlos Antonio da Silva | 2013-03-11 | 1 | -40/+40 | |
| | | | | | | | | | | | | Using regexps as arguments without parentheses end up raising: warning: ambiguous first argument; put parentheses or even spaces | |||||
* | | Merge pull request #9666 from sikachu/master-fix-test_test_failure | Rafael Mendonça França | 2013-03-11 | 1 | -1/+17 | |
|\ \ | | | | | | | Make sure that the test case is run under test env | |||||
| * | | Make sure that the test case is run under test env | Prem Sichanugrist | 2013-03-11 | 1 | -1/+17 | |
| | | | | | | | | | | | | | | | | | | * Unset $RAILS_ENV that got set by abstract_unit to trigger the default. * split out environment setting since Ruby 1.9.3 doesn't support inline ENV setting. | |||||
* | | | Mention that debugging can be slow. | Steve Klabnik | 2013-03-11 | 1 | -0/+2 | |
|/ / | | | | | | | | | | | https://github.com/rails/rails/pull/3180\#issuecomment-14705821 has mention of rendering going from 1-2ms to 4 seconds with this on, which seems reasonable: debugging is slow. | |||||
* | | Fix test failure introduced in 3ed41e57 | Prem Sichanugrist | 2013-03-11 | 1 | -5/+3 | |
| | | | | | | | | I forgot to run the test suit after changing the task name. :bomb: | |||||
* | | Merge pull request #9080 from sikachu/master-rails-test | Rafael Mendonça França | 2013-03-11 | 7 | -65/+532 | |
|\ \ | | | | | | | Add `rails test` command to run the test suite | |||||
| * | | Make sure that `rails test` load test in test env | Prem Sichanugrist | 2013-03-09 | 4 | -7/+55 | |
| | | | ||||||
| * | | Update Rake tasks to call `rails test` instead | Prem Sichanugrist | 2013-03-09 | 2 | -62/+41 | |
| | | | | | | | | | | | | | | | Also, print out deprecation warning for other rake tasks except `rake test` and `rake` (default) |