Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace comment about Sprockets stub directive with a link to README about ↵ | Guillermo Iguaran | 2013-06-03 | 2 | -2/+4 |
| | | | | all directives | ||||
* | Fixing a failing railtie test by using the ENV variable to specify a | wangjohn | 2013-05-31 | 1 | -1/+2 |
| | | | | particular controller to search for in rake routes. | ||||
* | Adding a test to make sure that using rake routes with the CONTROLLER | wangjohn | 2013-05-29 | 1 | -0/+12 |
| | | | | environment works correctly. | ||||
* | No need changelog entry | Rafael Mendonça França | 2013-05-28 | 1 | -2/+0 |
| | |||||
* | condition simplified | Oleg Sukhodolsky | 2013-05-28 | 1 | -1/+1 |
| | |||||
* | Merge pull request #10629 from stmpjmpr/bug_10628 | Rafael Mendonça França | 2013-05-28 | 2 | -1/+3 |
|\ | | | | | | | Fixes bug 10628. | ||||
| * | Fixes bug 10628. | Scott Hill | 2013-05-15 | 2 | -1/+3 |
| | | |||||
* | | add notice to server boot messages if using default 0.0.0.0 binding | Luke Wendling | 2013-05-25 | 1 | -0/+3 |
| | | |||||
* | | Add ActiveModel requirement to application.rb | Jamie Gaskins | 2013-05-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | Currently, ActiveModel is only loaded by ActiveRecord. If you skip ActiveRecord, ActiveModel will not be required (or even autoloaded) and including `ActiveModel::Model` into a plain Ruby class will raise `NameError`. To reproduce this: - create a new app with `rails new my_app -O` - create a Ruby class that includes `ActiveModel::Model` in `app/models` - load up a Rails console and try to do anything with the class :-) Since ActionPack relies so heavily on the ActiveModel API, this should probably be considered a dependency of the app. Another possibility would be to make it a dependency of ActionController. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-19 | 1 | -0/+2 |
|\ \ | |||||
| * | | copy edits[ci skip] | Vijay Dev | 2013-05-19 | 1 | -3/+1 |
| | | | |||||
| * | | Added documentation for Rails::Generators::NamedBase.template | aditya-kapoor | 2013-05-14 | 1 | -0/+4 |
| | | | |||||
* | | | Fxied some typos | Prathamesh Sonpatki | 2013-05-18 | 2 | -2/+2 |
| | | | |||||
* | | | plugin new missing license spec | AJ Acevedo | 2013-05-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When bundling a gem created with rails plugin new Bundler outputs the following warning when building the gem: WARNING: licenses is empty modified: railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec | ||||
* | | | Merge pull request #10527 from zenspider/squishy_minitest5 | Aaron Patterson | 2013-05-16 | 3 | -14/+14 |
|\ \ \ | | | | | | | | | Squishy minitest5 | ||||
| * | | | Updates to make rails 4 happy with minitest 5: | Ryan Davis | 2013-05-06 | 3 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Namespace changes, overhaul of runners. + Internal ivar name changes - Removed a logger globally applied to tests that spew everywhere?!? + Override Minitest#__run to sort tests by name. + Reworked testing isolation to work with the new cleaner architecture. - Removed a bunch of tests that just test minitest straight up. I think these changes were all merged to minitest 4 a long time ago. - Minor report output differences. | ||||
* | | | | Merge pull request #10594 from shime/rack-debugger | Aaron Patterson | 2013-05-16 | 2 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | exit with non-zero to signal failure | ||||
| * | | | | exit with non-zero to signal failure | Hrvoje Šimić | 2013-05-13 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | 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. |