aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* No need changelog entryRafael Mendonça França2013-05-281-2/+0
|
* condition simplifiedOleg Sukhodolsky2013-05-281-1/+1
|
* Merge pull request #10629 from stmpjmpr/bug_10628Rafael Mendonça França2013-05-282-1/+3
|\ | | | | | | Fixes bug 10628.
| * Fixes bug 10628.Scott Hill2013-05-152-1/+3
| |
* | add notice to server boot messages if using default 0.0.0.0 bindingLuke Wendling2013-05-251-0/+3
| |
* | Add ActiveModel requirement to application.rbJamie Gaskins2013-05-221-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/docrailsVijay Dev2013-05-191-0/+2
|\ \
| * | copy edits[ci skip]Vijay Dev2013-05-191-3/+1
| | |
| * | Added documentation for Rails::Generators::NamedBase.templateaditya-kapoor2013-05-141-0/+4
| | |
* | | Fxied some typosPrathamesh Sonpatki2013-05-182-2/+2
| | |
* | | plugin new missing license specAJ Acevedo2013-05-161-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_minitest5Aaron Patterson2013-05-163-14/+14
|\ \ \ | | | | | | | | Squishy minitest5
| * | | Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-063-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-debuggerAaron Patterson2013-05-162-4/+4
|\ \ \ \ | | | | | | | | | | exit with non-zero to signal failure
| * | | | exit with non-zero to signal failureHrvoje Šimić2013-05-132-4/+4
| | | | |
* | | | | restore whitespace in Gemfile between sqlite3 and sprocketsSam Ruby2013-05-161-1/+1
| | | | |
* | | | | Remove trailing line breakColin Bartlett2013-05-161-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 ↵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-122-5/+0
|\ \ \ | |_|/ |/| | Remove jruby-openssl from default Gemfile
| * | Removed jruby-openssl gem from default template GemfileJoe Kutner2013-05-102-5/+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
| | |
* | | Fix Typo existant -> existent [ci skip]Prathamesh Sonpatki2013-05-081-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
* | Fixes warning 'method redefined' in scaffold generators testsPrathamesh Sonpatki2013-05-051-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 Sonpatki2013-05-041-1/+1
| |
* | Use Ruby 1.9 syntaxRafael Mendonça França2013-05-041-2/+2
| |
* | Review the CHANGELOG entry [ci skip]Rafael Mendonça França2013-05-041-1/+2
| |
* | Fixes Scaffold generator with --assets=falseArun Agrawal2013-05-043-0/+20
| | | | | | | | | | | | Scaffold generator with --assets=false option outputs an error See #9525
* | Merge pull request #10436 from NARKOZ/keep-imagesRafael Mendonça França2013-05-043-0/+6
|\ \ | | | | | | generate 'app/assets/images' directory when creating new rails app. Fixes #10434
| * | generate 'app/assets/images' directory when creating new rails appNihad Abbasov2013-05-043-0/+6
| | |
* | | 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
| | | |
* | | | Add a test case for comparing Rails versionsSam Ruby2013-05-031-0/+5
| | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/558d402472b49c4c99bf6753d341d7aef2e25dd4
* | | | Fix generating route from engine to other enginePiotr Sarnacki2013-05-032-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.wangjohn2013-05-021-18/+4
| | |
* | | Remove not used module from initializable testCarlos Antonio da Silva2013-05-011-9/+1
| | |
* | | 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
| | |
* | | Removing the app constant and replacing it with Rails.applicationwangjohn2013-04-3013-18/+22
| | | | | | | | | | | | | | | 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
| | | |