aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #10436 from NARKOZ/keep-imagesRafael Mendonça França2013-05-042-0/+1
|\ \ | | | | | | generate 'app/assets/images' directory when creating new rails app. Fixes #10434
| * | generate 'app/assets/images' directory when creating new rails appNihad Abbasov2013-05-042-0/+1
| |/
* | Merge pull request #10461 from rwz/masterRafael Mendonça França2013-05-041-1/+1
|\ \ | |/ |/| Relaxed jbuilder dependency in Gemfile template
| * Relaxed jbuilder dependency in Gemfile templatePavel Pravosud2013-05-041-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-011-0/+7
|\ \
| * | routes.rb should teach how to use concernsThiago Pinto2013-05-011-0/+7
| | |
| * | Revert "Merge pull request #10194 from ↵Carlos Antonio da Silva2013-04-121-3/+1
| | | | | | | | | | | | | | | | | | | | | pabloh/extract_regexp_at_generators_testing_assertion" This reverts commit 81f243375b9d3cfd431c1ca904c5c1efc9a41ae8, reversing changes made to c7673b0981d961e5510c85d958c944876d543314.
| * | Merge pull request #10194 from ↵Carlos Antonio da Silva2013-04-121-1/+3
| |\ \ | | | | | | | | | | | | | | | | pabloh/extract_regexp_at_generators_testing_assertion Extract method declaration regexp for assert_method into a constant
| | * | Extract method declaration regexp into a constantPablo Herrero2013-04-121-1/+3
| | | |
* | | | Removing the app constant and replacing it with Rails.applicationwangjohn2013-04-309-9/+9
| | | | | | | | | | | | | | | | | | | | syntax. This helps removing the class level abstraction of an application.
* | | | Minor code duplication removedArun Agrawal2013-04-291-6/+6
| | | |
* | | | ActiveRecord -> Active RecordXavier Noria2013-04-221-1/+1
| | | |
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-04-191-2/+2
|\ \ \ \
| * | | | Unindent attributes iteration in scaffold index templateCarlos Antonio da Silva2013-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we get extra indent for the <td> elements due to the extra spaces at the beginning of the lines, like this: <tr> <td><%= author.name %></td> <td><%= link_to 'Show', author %></td> <td><%= link_to 'Edit', edit_author_path(author) %></td>
* | | | | AlignmentDavid Heinemeier Hansson2013-04-181-1/+1
|/ / / /
* | | | Indent around the scaffold loopDavid Heinemeier Hansson2013-04-181-8/+8
| | | |
* | | | HTML5 breaksDavid Heinemeier Hansson2013-04-182-4/+4
| | | |
* | | | Better orderingDavid Heinemeier Hansson2013-04-181-3/+3
| | | |
* | | | Use sass-rails 4.0.0.rc1Rafael Mendonça França2013-04-181-1/+1
| | | |
* | | | Use latest coffee-rails releaseRafael Mendonça França2013-04-181-1/+1
| | | |
* | | | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."Rafael Mendonça França2013-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue
* | | | Don't need to add activerecord-deprecated_finders on edge and devRafael Mendonça França2013-04-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | applications This gem will not change often to explain it be included in the application Gemfile
* | | | Use strip_heredoc where possibleSam Ruby2013-04-111-14/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following up on an observation by @rafaelfranca https://github.com/rails/rails/pull/10170/files#r3753963 Reduce the number of gsub calls to the two cases where inputs are concatenated from various sources and with inconsistent indentation. Also zap extraneous spacing from the sass-rails line... presumably this is a holdover from a previous time where this aligned the version string with an adjacent line.
* / / Editorial pass over generated GemfileSam Ruby2013-04-102-7/+11
|/ / | | | | | | | | | | * When run with default options, no repeated blank lines * Every gem has a comment, perhaps a generic one, but a comment nonetheless * Most comments used to start with "Use", some with "To use" => made consistent
* | sprockets 2.9.x doesn't work with uglifier 2.0 yet.Rafael Mendonça França2013-04-061-2/+2
| | | | | | | | | | | | See https://travis-ci.org/rails/rails/jobs/6110543#L1285 for the failure cc @josh
* | Merge branch 'master' into railstestAaron Patterson2013-04-052-11/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) Improve the changelog entry [ci skip] Fix explicit names on multiple file fields Correctly parse bigint defaults in PostgreSQL Move changelog to the top [ci skip] Fix indent and remove extra white spaces Fix scope chaining + STI failing test for #9869 Improve `belongs_to touch: true` timestamp test Sort modules in alphabetical order. Avoid an attempt to fetch old record when id was not present in touch callback Use the correct pk field from the reflected class to find the old record Refactor mail_to to not generate intermediate hashes when adding href Ensure mail_to helper does not modify the given html options hash Use inspect when writing the foreign key from the reflection Use a space after the comment sign when showing the result of commands Exclude template files for rdoc API [ci skip] template should have generic name use | to have more intent revealing code Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters" stop depending on callbacks ... Conflicts: railties/test/application/rake_test.rb
| * | Model generator USAGE doc improvedJason King2013-04-041-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
| * | add require to suppress warning; remove variableVipul A M2013-04-041-1/+1
| | |
* | | apps that depend on active record should load fixturesAaron Patterson2013-04-031-3/+2
|/ /
* | Avoid running bundler on tests that don't need itSam Ruby2013-04-031-1/+4
| |
* | Getting rid of a few other vestiges of rails.png.Steve Klabnik2013-04-021-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 Klabnik2013-04-021-1/+0
| | | | | | | | | | Since it's not a real file any longer, no need to worry about removing it when we reset the dummy.
* | .gitkeep -> .keepSteve Klabnik2013-04-021-0/+0
| | | | | | | | Mentioned in a comment in e90c2d029edc by @frodsan.
* | adding .gigkeep to default app/assets/imagesSteve Klabnik2013-04-021-0/+0
| |
* | Remove rails.png.Steve Klabnik2013-04-021-0/+0
| | | | | | | | | | | | | | 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 Pastorino2013-04-021-3/+1
| | | | | | | | | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb
* | Revert more Rails.version changesRafael Mendonça França2013-04-013-4/+4
| | | | | | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc
* | 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-011-1/+1
|\ \ \ | |/ / |/| | Cookie-base session store auto-upgrade
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-281-1/+1
| | | | | | | | | | | | 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.
* | | be lazy loading SDocXavier Noria2013-03-301-1/+1
| | |
* | | rdoc is no longer a gem dependency, sdoc becomes a runtime dependencyXavier Noria2013-03-301-0/+5
| | |
* | | 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