aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Removed incorrect warning from application.js templates and replaced it with ↵Nick2013-05-152-4/+2
| | | | stub command description
* Updated comment to Rails 4AJ Acevedo2013-05-121-1/+1
|
* better error message when app name is not passed in `rails new`Hrvoje Šimić2013-05-121-1/+9
| | | | | | | | | | Prior to this change, for the following command: $ rails new we received "Options should be given after the application name" as an error message. This is outdated and should be "Application name should be provided in arguments".
* Merge pull request #10560 from jkutner/masterRafael Mendonça França2013-05-121-2/+0
|\ | | | | Remove jruby-openssl from default Gemfile
| * Removed jruby-openssl gem from default template GemfileJoe Kutner2013-05-101-2/+0
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-121-5/+5
|\ \ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | Improve model generator USAGE grammarMatthew Michihara2013-05-051-5/+5
| | |
* | | Clean up unused method for `rake doc`.Teng Siong Ong2013-05-111-5/+0
| |/ |/|
* | rails -> Rails [ci skip]Prathamesh Sonpatki2013-05-092-2/+2
| |
* | "rails" -> "Rails" [ci skip]Xavier Noria2013-05-091-2/+2
| |
* | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]Xavier Noria2013-05-061-45/+56
| | | | | | | | See the comment in the rescue clause towards the top of the patch for the rationale.
* | Updated link to to GitHub article about ignoring files [ci skip]Prathamesh Sonpatki2013-05-051-1/+1
| | | | | | | | - http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files
* | dir -> directory [ci skip]Prathamesh Sonpatki2013-05-041-1/+1
| |
* | Use Ruby 1.9 syntaxRafael Mendonça França2013-05-041-2/+2
| |
* | Fixes Scaffold generator with --assets=falseArun Agrawal2013-05-041-0/+2
| | | | | | | | | | | | Scaffold generator with --assets=false option outputs an error See #9525
* | 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
| | | |
* | | | Fix generating route from engine to other enginePiotr Sarnacki2013-05-031-0/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A regression was introduced in 5b3bb6, generating route from within an engine to an another engine resulted in prefixing a path with the SCRIPT_NAME value. The regression was caused by the fact that SCRIPT_NAME should be appended only if it's the SCRIPT_NAME for the application, not if it's SCRIPT_NAME from the current engine. closes #10409
* | | Refactoring the creation of TestTasks to remove code duplication.wangjohn2013-05-021-18/+4
| | |
* | | Make railties version match RAILS_VERSIONSam Ruby2013-05-011-2/+2
| |/ |/|
* | 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-3011-14/+18
| | | | | | | | | | | | | | | | | | | | syntax. This helps removing the class level abstraction of an application.
* | | | Merge pull request #10357 from ↵Rafael Mendonça França2013-04-301-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | arunagw/minor-code-deuplication-removed-app-generator Minor code duplication removed
| * | | | Minor code duplication removedArun Agrawal2013-04-291-6/+6
| | | | |
* | | | | Make `rake doc:guides` works again. Fix #10384.Teng Siong Ong2013-04-301-2/+2
| | | | |
* | | | | Removing Railtie::Configurable from the base Railtie object and makingwangjohn2013-04-292-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Railtie itself abstract. This stops the weird behavior of forcing subclasses of Railtie to include the Configurable module.
* | | | | Bump version to rc1David Heinemeier Hansson2013-04-291-1/+1
|/ / / /
* | | | Moved the check for the rails test environment into rails/test_unit so that youwangjohn2013-04-232-4/+4
| | | | | | | | | | | | | | | | can select frameworks separately when running rake test.
* | | | 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.
* | | application loader refactor and test suite complete rewriteXavier Noria2013-04-111-28/+27
| | |
* | | 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
* | | code review of 22e5ab3Xavier Noria2013-04-101-8/+7
| | |
* | | Searching for rails executable correctlyPrathamesh Sonpatki2013-04-101-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Current logic of finding Rails executable in parent directory is not returning full path of executable if it is found in one of the parent directories * To compensate for this, we have to call exec_app_rails recursively until the executable is found or we cant do 'chdir' anymore * This solution finds the correct executable path from parent directory(s) recursively