aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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
* :scissors:Rafael Mendonça França2013-04-011-4/+4
| | | | [ci skip]
* Remove CHANGELOG entry for #10002Rafael Mendonça França2013-04-011-4/+0
| | | | [ci skip]
* Merge pull request #10002 from charliesome/revert-version-method-on-railsJeremy Kemper2013-04-012-7/+10
|\ | | | | Reverts changes to Rails.version made in #8501
| * reverts changes to Rails.version made in #8501Charlie Somerville2013-03-302-7/+10
| |
* | 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-014-16/+69
|\ \ \ | |/ / |/| | Cookie-base session store auto-upgrade
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-284-16/+69
| | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config
* | | cleanup railties test; fix typosVipul A M2013-03-313-6/+5
| | |
* | | Make comment about uglifier in generated Gemfile consistent between branchesCarlos Antonio da Silva2013-03-301-1/+1
| | | | | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393.
* | | Merge pull request #9991 from Passionate/patch-1Rafael Mendonça França2013-03-301-18/+50
|\ \ \ | | | | | | | | improve readability
| * | | improve readabilityParitosh Piplewar2013-03-291-18/+50
| | | |
* | | | Use last released version of thorGuillermo Iguaran2013-03-301-1/+1
| | | |
* | | | 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-303-5/+17
| | | |
* | | | 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
| | |