Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | restore whitespace in Gemfile between sqlite3 and sprockets | Sam Ruby | 2013-05-16 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Remove trailing line break | Colin Bartlett | 2013-05-16 | 1 | -1/+1 | |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | If you generate a fresh app without ActiverRecord, this template exhibited a lone trailing line break. My watchful pre-commit hook told me about it so I've fixed it here. | |||||
* | | | | Removed incorrect warning from application.js templates and replaced it with ↵ | Nick | 2013-05-15 | 2 | -4/+2 | |
|/ / / | | | | | | | | | | stub command description | |||||
* | | | Updated comment to Rails 4 | AJ Acevedo | 2013-05-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | better error message when app name is not passed in `rails new` | Hrvoje Šimić | 2013-05-12 | 1 | -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/master | Rafael Mendonça França | 2013-05-12 | 2 | -5/+0 | |
|\ \ \ | |_|/ |/| | | Remove jruby-openssl from default Gemfile | |||||
| * | | Removed jruby-openssl gem from default template Gemfile | Joe Kutner | 2013-05-10 | 2 | -5/+0 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-12 | 1 | -5/+5 | |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb | |||||
| * | | | Improve model generator USAGE grammar | Matthew Michihara | 2013-05-05 | 1 | -5/+5 | |
| | | | | ||||||
* | | | | Clean up unused method for `rake doc`. | Teng Siong Ong | 2013-05-11 | 1 | -5/+0 | |
| |/ / |/| | | ||||||
* | | | rails -> Rails [ci skip] | Prathamesh Sonpatki | 2013-05-09 | 2 | -2/+2 | |
| | | | ||||||
* | | | "rails" -> "Rails" [ci skip] | Xavier Noria | 2013-05-09 | 1 | -2/+2 | |
| | | | ||||||
* | | | Fix Typo existant -> existent [ci skip] | Prathamesh Sonpatki | 2013-05-08 | 1 | -2/+2 | |
| |/ |/| | ||||||
* | | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462] | Xavier Noria | 2013-05-06 | 1 | -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 Sonpatki | 2013-05-05 | 1 | -1/+1 | |
| | | | | | | | | - http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files | |||||
* | | Fixes warning 'method redefined' in scaffold generators tests | Prathamesh Sonpatki | 2013-05-05 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | - f1805a697831 Redefined 'test_scaffold_generator_no_assets' twice. - Only the last instance of these three definitions of the same method was getting called when the tests were actually running. - This commit changes names of this method so that all three definitions will be called - scaffold.css is not generated by --assets=false switch. - Test was expecting the presence of the file with --assets=false - This issue was not discovered in f1805a697831b because it was redefining the same method twice | |||||
* | | dir -> directory [ci skip] | Prathamesh Sonpatki | 2013-05-04 | 1 | -1/+1 | |
| | | ||||||
* | | Use Ruby 1.9 syntax | Rafael Mendonça França | 2013-05-04 | 1 | -2/+2 | |
| | | ||||||
* | | Review the CHANGELOG entry [ci skip] | Rafael Mendonça França | 2013-05-04 | 1 | -1/+2 | |
| | | ||||||
* | | Fixes Scaffold generator with --assets=false | Arun Agrawal | 2013-05-04 | 3 | -0/+20 | |
| | | | | | | | | | | | | Scaffold generator with --assets=false option outputs an error See #9525 | |||||
* | | Merge pull request #10436 from NARKOZ/keep-images | Rafael Mendonça França | 2013-05-04 | 3 | -0/+6 | |
|\ \ | | | | | | | generate 'app/assets/images' directory when creating new rails app. Fixes #10434 | |||||
| * | | generate 'app/assets/images' directory when creating new rails app | Nihad Abbasov | 2013-05-04 | 3 | -0/+6 | |
| | | | ||||||
* | | | Merge pull request #10461 from rwz/master | Rafael Mendonça França | 2013-05-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Relaxed jbuilder dependency in Gemfile template | |||||
| * | | | Relaxed jbuilder dependency in Gemfile template | Pavel Pravosud | 2013-05-04 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Add a test case for comparing Rails versions | Sam Ruby | 2013-05-03 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/558d402472b49c4c99bf6753d341d7aef2e25dd4 | |||||
* | | | | Fix generating route from engine to other engine | Piotr Sarnacki | 2013-05-03 | 2 | -0/+46 | |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | wangjohn | 2013-05-02 | 1 | -18/+4 | |
| | | | ||||||
* | | | Remove not used module from initializable test | Carlos Antonio da Silva | 2013-05-01 | 1 | -9/+1 | |
| | | | ||||||
* | | | Make railties version match RAILS_VERSION | Sam Ruby | 2013-05-01 | 1 | -2/+2 | |
| |/ |/| | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-01 | 1 | -0/+7 | |
|\ \ | ||||||
| * | | routes.rb should teach how to use concerns | Thiago Pinto | 2013-05-01 | 1 | -0/+7 | |
| | | | ||||||
* | | | Removing the app constant and replacing it with Rails.application | wangjohn | 2013-04-30 | 13 | -18/+22 | |
| | | | | | | | | | | | | | | | syntax. This helps removing the class level abstraction of an application. | |||||
* | | | Merge pull request #10357 from ↵ | Rafael Mendonça França | 2013-04-30 | 1 | -6/+6 | |
|\ \ \ | | | | | | | | | | | | | | | | | arunagw/minor-code-deuplication-removed-app-generator Minor code duplication removed | |||||
| * | | | Minor code duplication removed | Arun Agrawal | 2013-04-29 | 1 | -6/+6 | |
| | | | | ||||||
* | | | | Make `rake doc:guides` works again. Fix #10384. | Teng Siong Ong | 2013-04-30 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Removing Railtie::Configurable from the base Railtie object and making | wangjohn | 2013-04-29 | 5 | -21/+45 | |
| | | | | | | | | | | | | | | | | | | | | Railtie itself abstract. This stops the weird behavior of forcing subclasses of Railtie to include the Configurable module. | |||||
* | | | | rails/master is now 4.1.0.beta | Rafael Mendonça França | 2013-04-29 | 1 | -374/+2 | |
| | | | | ||||||
* | | | | Bump version to rc1 | David Heinemeier Hansson | 2013-04-29 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Moved the check for the rails test environment into rails/test_unit so that you | wangjohn | 2013-04-23 | 2 | -4/+4 | |
| | | | | | | | | | | | | can select frameworks separately when running rake test. | |||||
* | | | ActiveRecord -> Active Record | Xavier Noria | 2013-04-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | extract path into variable | buddhamagnet | 2013-04-21 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2013-04-19 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Unindent attributes iteration in scaffold index template | Carlos Antonio da Silva | 2013-04-18 | 1 | -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> | |||||
* | | | | Alignment | David Heinemeier Hansson | 2013-04-18 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Indent around the scaffold loop | David Heinemeier Hansson | 2013-04-18 | 1 | -8/+8 | |
| | | | ||||||
* | | | HTML5 breaks | David Heinemeier Hansson | 2013-04-18 | 2 | -4/+4 | |
| | | | ||||||
* | | | Better ordering | David Heinemeier Hansson | 2013-04-18 | 1 | -3/+3 | |
| | | | ||||||
* | | | Use sass-rails 4.0.0.rc1 | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Use latest coffee-rails release | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet." | Rafael Mendonça França | 2013-04-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue |