Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | Fix missing closing <tt> tag | Patrick Helm | 2013-03-12 | 1 | -1/+1 |
| | | |||||
* | | typo | Xavier Noria | 2013-03-30 | 1 | -1/+1 |
| | | |||||
* | | rdoc is no longer a gem dependency, sdoc becomes a runtime dependency | Xavier Noria | 2013-03-30 | 1 | -0/+5 |
| | | |||||
* | | unifies API generation | Xavier Noria | 2013-03-30 | 2 | -53/+34 |
| | | |||||
* | | moves RDOC_MAIN.rdoc to railties | Xavier Noria | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | 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 |
| | | |||||
* | | 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 | ||||
* | | default RAILS_ENV to test if we're in a test task | Aaron Patterson | 2013-03-25 | 1 | -0/+4 |
| | | |||||
* | | 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 | 1 | -15/+27 |
|/ / | | | | | | | 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 | ||||
* | | Merge pull request #8501 from charliesome/version-to-s | Rafael Mendonça França | 2013-03-23 | 7 | -17/+14 |
|\ \ | | | | | | | Add #to_s method to VERSION modules | ||||
| * | | remove references to *::VERSION, replace with *.version | Charlie Somerville | 2013-03-21 | 6 | -11/+7 |
| | | | |||||
| * | | 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 generate a scaffold.css if no-assets | Kevin Glowacz | 2013-03-20 | 1 | -0/+1 |
| | | |||||
* | | 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. | ||||
* | | 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 | 7 | -13/+29 |
| | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | 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. | ||||
* | | 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. | ||||
* | | Merge pull request #9080 from sikachu/master-rails-test | Rafael Mendonça França | 2013-03-11 | 4 | -55/+189 |
|\ \ | | | | | | | Add `rails test` command to run the test suite | ||||
| * | | Make sure that `rails test` load test in test env | Prem Sichanugrist | 2013-03-09 | 3 | -6/+11 |
| | | | |||||
| * | | Update Rake tasks to call `rails test` instead | Prem Sichanugrist | 2013-03-09 | 1 | -52/+28 |
| | | | | | | | | | | | | | | | Also, print out deprecation warning for other rake tasks except `rake test` and `rake` (default) | ||||
| * | | Improve wording for rails test command | Dalibor Nasevic | 2013-03-09 | 2 | -19/+19 |
| | | | |||||
| * | | Load fixtures only when running suites, or `-f` | Prem Sichanugrist | 2013-03-09 | 2 | -3/+21 |
| | | | | | | | | | | | | | | | | | | * `rails test -f` will run the test suites with all fixtures loaded * New application will now generated without `fixtures :all` line enabled by default. | ||||
| * | | Add support for MiniTest flags in TestRunner | Prem Sichanugrist | 2013-03-09 | 2 | -39/+67 |
| | | | | | | | | | | | | | | | Any flags that got set will be passed through to MiniTest::Unit.runner, such as `-n`, `-s-, and `-v`. | ||||
| * | | Add `rails test` command to run the test suite | Prem Sichanugrist and Chris Toomey | 2013-03-09 | 2 | -0/+107 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To run the whole test suite: $ rails test To run the test file(s): $ rails test test/unit/foo_test.rb [test/unit/bar_test.rb ...] To run the test suite $ rails test [models,helpers,units,controllers,mailers,...] For more information, see `rails test --help`. This command will eventually replacing `rake test:*`, and `rake test` command will actually invoking `rails test` instead. | ||||
* / | Make sure that debugger isn't included in production environment. | Teng Siong Ong | 2013-03-09 | 1 | -1/+1 |
|/ | |||||
* | 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 rails console --sandbox | Jon Leighton | 2013-03-08 | 1 | -1/+3 |
| | | | | | | 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 | 2 | -19/+42 |
| | | | | | 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 | 3 | -33/+126 |
|\ | | | | | New 404, 422, 500 pages, they are more stylish and bring ruby essence… | ||||
| * | New beauty pages(404, 422, 500) | Stanislav | 2013-03-02 | 3 | -33/+126 |
| | | | | | | | | | | | | 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 | 1 | -6/+7 |
| | | |||||
* | | :scissors: extra blank line | Akira Matsuda | 2013-03-02 | 1 | -1/+0 |
|/ | |||||
* | Ensure plugins generated with plugin new can boot the dummy application | José Valim | 2013-02-28 | 5 | -14/+35 |
| | |||||
* | There's no need to access Railties through self.class | Santiago Pastorino | 2013-02-27 | 1 | -1/+2 |
| | | | | Closes #9386 |