Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10092 from amco/master | Carlos Antonio da Silva | 2013-04-04 | 1 | -10/+16 |
|\ | | | | | Model generator USAGE doc improvement | ||||
| * | Model generator USAGE doc improved | Jason King | 2013-04-04 | 1 | -10/+16 |
| | | | | | | | | | | | | * Added information about syntax for precision/scale of decimals * Removed incorrect information about being able to set `default` * Added more examples of usage | ||||
* | | Exclude template files for rdoc API [ci skip] | Francesco Rodriguez | 2013-04-04 | 1 | -1/+2 |
|/ | |||||
* | add require to suppress warning; remove variable | Vipul A M | 2013-04-04 | 1 | -1/+1 |
| | |||||
* | Merge pull request #10074 from ↵ | Rafael Mendonça França | 2013-04-03 | 1 | -1/+0 |
|\ | | | | | | | | | trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1 | ||||
| * | Remove comments about removing LegacyKeyGenerator in 4.1 | Trevor Turk | 2013-04-03 | 1 | -1/+0 |
| | | |||||
* | | Avoid running bundler on tests that don't need it | Sam Ruby | 2013-04-03 | 1 | -1/+4 |
| | | |||||
* | | Getting rid of a few other vestiges of rails.png. | Steve Klabnik | 2013-04-02 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides. | ||||
* | | 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 | 1 | -2/+2 |
| | |||||
* | 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. | ||||
* | 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 | ||||
* | 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 | 2 | -7/+8 |
|\ \ \ | |/ / |/| | | Cookie-base session store auto-upgrade | ||||
| * | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 2 | -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 branches | Carlos Antonio da Silva | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393. | ||||
* | | | 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 | 2 | -5/+12 |
| | | | |||||
* | | | 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 |
| | |