Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | We don't need to remove index.html any more. | Steve Klabnik | 2013-04-02 | 1 | -1/+0 |
| | | | | | Since it's not a real file any longer, no need to worry about removing it when we reset the dummy. | ||||
* | .gitkeep -> .keep | Steve Klabnik | 2013-04-02 | 1 | -0/+0 |
| | | | | Mentioned in a comment in e90c2d029edc by @frodsan. | ||||
* | Rename DummyKeyGenerator -> LegacyKeyGenerator | Trevor Turk | 2013-04-02 | 2 | -4/+4 |
| | |||||
* | Fix tests from rails.png removal. | Jessica Lynn Suttles | 2013-04-02 | 1 | -1/+8 |
| | | | | | I'm giving @jlsuttles credit on this commit because she gave me the idea and the actual converted image in 952289aabfb. | ||||
* | adding .gigkeep to default app/assets/images | Steve Klabnik | 2013-04-02 | 1 | -0/+0 |
| | |||||
* | Remove rails.png. | Steve Klabnik | 2013-04-02 | 2 | -1/+1 |
| | | | | | | | No reason to have a file, we've got data-URIs now! It didn't make sense to me that you no longer have to remove public/index.html, but you still need to remove rails.png. This means that you won't have to any more when making a new Rails app. | ||||
* | Merge pull request #3782 from arunagw/warning_mode_on | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 |
|\ | | | | | Turning on warnings in "rake test" for railties | ||||
| * | Turning on warnings in "rake test" for railties | Arun Agrawal | 2013-04-01 | 1 | -1/+1 |
| | | |||||
* | | Revert "Use jquery-rails from github" | Santiago Pastorino | 2013-04-02 | 1 | -3/+1 |
| | | | | | | | | | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb | ||||
* | | Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184a | Santiago Pastorino | 2013-04-01 | 1 | -4/+4 |
| | | |||||
* | | Revert more Rails.version changes | Rafael Mendonça França | 2013-04-01 | 4 | -5/+5 |
| | | | | | | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc | ||||
* | | :scissors: | Rafael Mendonça França | 2013-04-01 | 1 | -4/+4 |
| | | | | | | | | [ci skip] | ||||
* | | Remove CHANGELOG entry for #10002 | Rafael Mendonça França | 2013-04-01 | 1 | -4/+0 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #10002 from charliesome/revert-version-method-on-rails | Jeremy Kemper | 2013-04-01 | 2 | -7/+10 |
|\ \ | | | | | | | Reverts changes to Rails.version made in #8501 | ||||
| * | | reverts changes to Rails.version made in #8501 | Charlie Somerville | 2013-03-30 | 2 | -7/+10 |
| | | | |||||
* | | | Move the class methods to above the protected section | Rafael Mendonça França | 2013-04-01 | 3 | -47/+36 |
| | | | |||||
* | | | Merge pull request #10021 from pabloh/refactor_rails_generator_test_case | Rafael Mendonça França | 2013-04-01 | 4 | -211/+259 |
|\ \ \ | | | | | | | | | | | | | Refactor Rails::Generator::TestCase into modules | ||||
| * | | | Break down Rails::Generator::TestCase into modules | Pablo Herrero | 2013-03-31 | 4 | -211/+259 |
| | |/ | |/| | |||||
* | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade | Santiago Pastorino | 2013-04-01 | 4 | -16/+69 |
|\ \ \ | |/ / |/| | | Cookie-base session store auto-upgrade | ||||
| * | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 4 | -16/+69 |
| | | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config | ||||
* | | | cleanup railties test; fix typos | Vipul A M | 2013-03-31 | 3 | -6/+5 |
| | | | |||||
* | | | Make comment about uglifier in generated Gemfile consistent between branches | Carlos Antonio da Silva | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393. | ||||
* | | | Merge pull request #9991 from Passionate/patch-1 | Rafael Mendonça França | 2013-03-30 | 1 | -18/+50 |
|\ \ \ | | | | | | | | | improve readability | ||||
| * | | | improve readability | Paritosh Piplewar | 2013-03-29 | 1 | -18/+50 |
| | | | | |||||
* | | | | Use last released version of thor | Guillermo Iguaran | 2013-03-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | configure API generation lazily | Xavier Noria | 2013-03-30 | 1 | -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 files | Xavier Noria | 2013-03-30 | 1 | -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 SDoc | Xavier Noria | 2013-03-30 | 3 | -5/+17 |
| | | | | |||||
* | | | | 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 |
| | | | | |||||
* | | | | adds the API home page to the gemspec, needed for doc:rails | Xavier Noria | 2013-03-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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 |