aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Use jquery-rails from github"Santiago Pastorino2013-04-021-3/+1
| | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb
* Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184aSantiago Pastorino2013-04-011-4/+4
|
* Revert more Rails.version changesRafael Mendonça França2013-04-014-5/+5
| | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc
* Merge pull request #10002 from charliesome/revert-version-method-on-railsJeremy Kemper2013-04-011-7/+6
|\ | | | | Reverts changes to Rails.version made in #8501
| * reverts changes to Rails.version made in #8501Charlie Somerville2013-03-301-7/+6
| |
* | Move the class methods to above the protected sectionRafael Mendonça França2013-04-013-47/+36
| |
* | Merge pull request #10021 from pabloh/refactor_rails_generator_test_caseRafael Mendonça França2013-04-014-211/+259
|\ \ | | | | | | | | | Refactor Rails::Generator::TestCase into modules
| * | Break down Rails::Generator::TestCase into modulesPablo Herrero2013-03-314-211/+259
| | |
* | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-012-7/+8
|\ \ \ | |/ / |/| | Cookie-base session store auto-upgrade
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-282-7/+8
| | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config
* | | Make comment about uglifier in generated Gemfile consistent between branchesCarlos Antonio da Silva2013-03-301-1/+1
| | | | | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393.
* | | configure API generation lazilyXavier Noria2013-03-301-7/+11
| | | | | | | | | | | | | | | Do the absolute bare minimum needed to define this task, no need to compute gem paths everytime you call rake.
* | | be lazy configuring the RDoc filesXavier Noria2013-03-301-2/+1
| | | | | | | | | | | | | | | This code is executed every time you run a rake task, there is no need to, specially adding a penalty to test suites.
* | | be lazy loading SDocXavier Noria2013-03-302-5/+12
| | |
* | | 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
| | |
* | | typoXavier Noria2013-03-301-1/+1
| | |
* | | rdoc is no longer a gem dependency, sdoc becomes a runtime dependencyXavier Noria2013-03-301-0/+5
| | |
* | | unifies API generationXavier Noria2013-03-302-53/+34
| | |
* | | moves RDOC_MAIN.rdoc to railtiesXavier Noria2013-03-301-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::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
| |/ |/|
* | 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
* | default RAILS_ENV to test if we're in a test taskAaron Patterson2013-03-251-0/+4
| |
* | 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-241-15/+27
|/ / | | | | | | 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
* | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-236-13/+14
|\ \ | | | | | | Add #to_s method to VERSION modules
| * | remove references to *::VERSION, replace with *.versionCharlie Somerville2013-03-215-7/+7
| | |
| * | 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 generate a scaffold.css if no-assetsKevin Glowacz2013-03-201-0/+1
| |
* | 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.
* | 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-137-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#appCarlos Antonio da Silva2013-03-121-1/+4
| | | | | | | | Cache the value of "super" in a variable and use it instead.
* | 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.
* | Merge pull request #9080 from sikachu/master-rails-testRafael Mendonça França2013-03-114-55/+189
|\ \ | | | | | | Add `rails test` command to run the test suite
| * | Make sure that `rails test` load test in test envPrem Sichanugrist2013-03-093-6/+11
| | |
| * | Update Rake tasks to call `rails test` insteadPrem Sichanugrist2013-03-091-52/+28
| | | | | | | | | | | | | | | Also, print out deprecation warning for other rake tasks except `rake test` and `rake` (default)
| * | Improve wording for rails test commandDalibor Nasevic2013-03-092-19/+19
| | |
| * | Load fixtures only when running suites, or `-f`Prem Sichanugrist2013-03-092-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.