aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-301-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> tagPatrick Helm2013-03-121-1/+1
| |
* | adds the API home page to the gemspec, needed for doc:railsXavier Noria2013-03-301-1/+1
| |
* | typoXavier Noria2013-03-301-1/+1
| |
* | registers the new doc:rails behaviour in the changelogXavier Noria2013-03-301-0/+5
| |
* | rdoc is no longer a gem dependency, sdoc becomes a runtime dependencyXavier Noria2013-03-302-1/+5
| |
* | unifies API generationXavier Noria2013-03-302-53/+34
| |
* | moves RDOC_MAIN.rdoc to railtiesXavier Noria2013-03-302-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::TaskXavier Noria2013-03-301-0/+122
| |
* | Update the call to Bundler.require in application.rb since assets group ↵Guillermo Iguaran2013-03-281-2/+3
| | | | | | | | doesn't exist anymore in Gemfile
* | Add better comments to assets gemsGuillermo Iguaran2013-03-281-9/+22
| |
* | Fix typoPrathamesh Sonpatki2013-03-281-1/+1
| |
* | Add coffee-rails and javascript runtime to gemfile if skip_javascript isRafael Mendonça França2013-03-281-2/+9
| | | | | | | | provided
* | Remove buggy and unnecessary logicSam Ruby2013-03-271-7/+0
| | | | | | | | based on a discussion with @rafaelfranca
* | Cosmetic cleanup of generated GemfileSam Ruby2013-03-271-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 Chapman2013-03-261-1/+1
| | | | | | | | Fixing some typos/grammar.
* | default RAILS_ENV to test if we're in a test taskAaron Patterson2013-03-251-0/+4
| |
* | Fixed typo in railties/testPrathamesh Sonpatki2013-03-252-2/+2
| |
* | Controller name pluralizedPrathamesh Sonpatki2013-03-251-2/+2
| |
* | Fix jquery-as-default test to account for switch from gem to github source ↵Jeremy Kemper2013-03-251-1/+1
| | | | | | | | in #9904
* | Merge pull request #9909 from trevorturk/9740Jeremy Kemper2013-03-241-0/+1
|\ \ | | | | | | Transparently upgrade signed cookies when setting secret_key_base
| * | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵Trevor Turk2013-03-241-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 GemfileGabe Kopley2013-03-243-16/+43
|/ / | | | | | | v3 of pull request based on additional feedback from @jeremy
* | Use jquery-rails from githubSam Ruby2013-03-241-1/+3
| | | | | | | | completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980
* | Fix some typosVipul A M2013-03-243-3/+3
| |
* | Fix test: ActiveSupport.version is returning now a Gem::Version instead of a ↵Guillermo Iguaran2013-03-241-1/+1
| | | | | | | | String
* | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-2310-20/+21
|\ \ | | | | | | Add #to_s method to VERSION modules
| * | add changelog entryCharlie Somerville2013-03-241-0/+4
| | |
| * | remove references to *::VERSION, replace with *.versionCharlie Somerville2013-03-218-14/+10
| | |
| * | Add version method to top level modulesCharlie Somerville2013-03-211-6/+7
| | |
* | | Better styles for the CSS [ci skip]Rafael Mendonça França2013-03-233-38/+38
| | |
* | | Don't kill the consoleJon Leighton2013-03-221-10/+2
| | | | | | | | | | | | | | | Use the "quit" command instead. This seems to prevents some weirdness on OS X. See #9761.
* | | Send SIGTERM, not SIGQUIT.Jon Leighton2013-03-221-1/+1
|/ / | | | | | | | | | | SIGTERM is the correct signal for a graceful exit. This will hopefully resolve #9761.
* | Don't generate a scaffold.css if no-assetsKevin Glowacz2013-03-203-1/+6
| |
* | fix sentence [ci skip]Neeraj Singh2013-03-191-1/+1
| |
* | Initialize @app_env_config now that the var name has changedCarlos Antonio da Silva2013-03-191-1/+1
| | | | | | | | Check 862389c9537dbb6f65fd26c4325e07607ed437b5 for more background.
* | Use @app_env_config instead of @env_configJosé Valim2013-03-181-1/+1
| | | | | | | | Check pull request #9789 for more information.
* | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-181-1/+1
| | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* | instruct RDoc to only parse Ruby files under lib [Fixes #9779]Xavier Noria2013-03-181-1/+1
| |
* | More helpful message when starting serverGabe Kopley2013-03-181-1/+1
| | | | | | | | v2 of pull request based on feedback from @rafaelfranca, @schneems, and @carlosantoniodasilva
* | config.ru uses the effective Rack appYves Senn2013-03-152-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_nameArun Agrawal2013-03-151-1/+0
| | | | | | | | warning: assigned but unused variable - task_name
* | Add support for generate scaffold password:digestSam Ruby2013-03-139-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 Silva2013-03-131-20/+21
| |
* | Stop calling "super" twice in Rails::Server#appCarlos Antonio da Silva2013-03-121-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 warningsCarlos Antonio da Silva2013-03-111-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_failureRafael Mendonça França2013-03-111-1/+17
|\ \ | | | | | | Make sure that the test case is run under test env
| * | Make sure that the test case is run under test envPrem Sichanugrist2013-03-111-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 Klabnik2013-03-111-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 3ed41e57Prem Sichanugrist2013-03-111-5/+3
| | | | | | | | I forgot to run the test suit after changing the task name. :bomb: