aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Match Dev/Prod parity for Index Page"Piotr Sarnacki2013-07-222-4/+2
| | | | | | | | Showing welcome page in production can expose information, which should not be visible on production if people don't override the default root route. This reverts commit b0caea29c2da9f4c8bb958019813482da297067d.
* Merge pull request #11514 from schneems/schneems/dev-prod-parity-indexPiotr Sarnacki2013-07-222-2/+4
|\ | | | | Match Dev/Prod parity for Index Page
| * Match Dev/Prod parity for Index Pageschneems2013-07-202-2/+4
| | | | | | | | | | | | | | With Rails 4 the default index page was moved from a static file `index.html` inside the `public/` folder to an internal controller/view inside of the railties gem. This was to allow use of erb in the default index page and to remove the requirement that new apps must delete a static file to make their index pages work. While this was a good change, the functionality was unexpected to developers who wish to get their apps running in production ASAP. They will create a new app `rails new my app`, start a server to verify it works, then immediately deploy the app to verify that it can start working in production. Unfortunately locally they see a page when they visit `localhost:3000` when they visit their production app they get an error page. We initially anticipated this problem in the original pull request, but did not properly anticipate the severity or quantity of people who would like this functionality. Having a default index page serves as an excellent litmus test for a passed deploy on default apps, and it is very unexpected to have a page work locally, but not on production. This change makes the default index page available in production if the developer has not over-written it by defining their own `root` path inside of routes.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-211-0/+6
|\ \
| * | use the appropriate RDoc code markupDamien Mathieu2013-07-181-2/+2
| | | | | | | | | | | | Thanks @fxn
| * | document the Rails::ConsoleMethods#helper and #controller methodsDamien Mathieu2013-07-181-0/+6
| | | | | | | | | | | | Closes rails/rails#11362
* | | Removed information about creating database[ci skip]Prathamesh Sonpatki2013-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As default index page is no longer in public folder, rails hits the welcome controller in railties for index action - If the database is not created or username and password are incorrect in database.yml, those errors are first shown before index action succeeds - welcome#index succeeds iff the database is created with correct details in database.yml - So this information about creating database is not required in the index template
* | | bcrypt-ruby stable is 3.1Burkhard Vogel-Kreykenbohm2013-07-171-1/+1
| |/ |/|
* | Fixed USAGE file for generator [ci skip]Arun Agrawal2013-07-161-1/+1
| |
* | Added generated unit test for generator generator and new test:generators ↵Josef Šimánek2013-07-166-1/+51
| | | | | | | | rake task included in test:all rake task.
* | Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"Santiago Pastorino2013-07-151-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 19ac034bdc9be175eff7cf54208ba14b43d97681. And allows webservers to configure X-Sendfile-Type. Closes #11440 thanks to [@MSch] Conflicts: railties/lib/rails/application.rb
* | Merge pull request #11425 from arunagw/actionview_api_generationXavier Noria2013-07-141-8/+7
|\ \ | | | | | | Actionview api generation
| * | Added actionview in API generation [ci skip]Arun Agrawal2013-07-141-8/+7
| | | | | | | | | CHANGELOG and LICENSE removed as suggested
* | | This is not needed anymore, before_initialize block can access configSantiago Pastorino2013-07-141-1/+0
|/ /
* | Remove update:application_controller rake task.Josef Šimánek2013-07-131-12/+2
| |
* | Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompileJosé Valim2013-07-101-1/+2
|\ \ | | | | | | #11381: Ignore config.eager_load=true for rake
| * | #11381: Ignore config.eager_load=true for rakePaul Nikitochkin2013-07-101-1/+2
| | | | | | | | | | | | Closes #11381
* | | Merge pull request #11385 from MarceloCajueiro/remove_string_interpolationRafael Mendonça França2013-07-091-2/+2
|\ \ \ | |/ / |/| | Remove unnecessary string interpolation
| * | Remove unnecessary string interpolationMarcelo G. Cajueiro2013-07-091-2/+2
| | | | | | | | | | | | Removed from controller template of scaffold generator.
* | | Merge pull request #11378 from wangjohn/class_for_application_generatorRafael Mendonça França2013-07-092-27/+63
|\ \ \ | | | | | | | | Creating a class to handle preparing ARGV.
| * | | Creating a class to handle preparing ARGV.wangjohn2013-07-092-27/+63
| |/ / | | | | | | | | | | | | | | | Before the AppGenerator is started, ARGV needs to be modified to correctly account for some things. I'm extracting these out into their own class.
* / / Using the instance variable for argv.wangjohn2013-07-091-2/+2
|/ / | | | | | | | | Instead of using the global constant ARGV, we're changing to using the instance variable because it is more testable.
* | Merge pull request #11355 from wangjohn/class_for_rails_commandsRafael Mendonça França2013-07-082-94/+172
|\ \ | | | | | | Creating a class for carrying out rails commands.
| * | Creating a class for carrying out rails commands.wangjohn2013-07-072-94/+172
| | | | | | | | | | | | | | | | | | This class encapsulates a lot of logic that wasn't very object oriented. Helper methods have been created to try to make things more logical and easy to read.
* | | handle notes in *.sass filesYuri Artemev2013-07-081-1/+1
|/ /
* / fixes Rails version for the stable API [ci skip]Xavier Noria2013-07-061-0/+8
|/
* Removed deprecated `Rails.application.railties.engines`.Arun Agrawal2013-07-041-6/+0
|
* Removed unused deprecation requires.Paul Nikitochkin2013-07-034-5/+0
|
* Removed deprecated threadsafe!Paul Nikitochkin2013-07-031-10/+0
|
* Merge pull request #11272 from vipulnsward/generator_updateRafael Mendonça França2013-07-031-6/+0
|\ | | | | Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attribute`
| * Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` inVipul A M2013-07-031-6/+0
| | | | | | | | favor of `ActiveRecord::Generators::ActiveModel#update`
* | Fix ruby patch level example in rails docs regarding info page [ci skip]Carlos Antonio da Silva2013-07-031-1/+1
|/ | | | Thanks @egilburg.
* Add patch level to Ruby version informationTyler Brock2013-07-031-2/+4
| | | | | Given the recent security related patches to ruby and rails it is more important than ever to know what patch level you are running.
* Merge pull request #10565 from prathamesh-sonpatki/rake-dbCarlos Antonio da Silva2013-07-021-1/+1
|\ | | | | Improved grammar and replaced 'dbs' slang with 'databases'
| * Improved grammar and replaced 'dbs' slang with 'databases'Prathamesh Sonpatki2013-06-271-1/+1
| |
* | Merge pull request #11134 from wangjohn/object_orienting_testing_rake_fileCarlos Antonio da Silva2013-07-022-15/+45
|\ \ | | | | | | Making the rake file for tests easier to read.
| * | Making the rake file for tests easier to read.wangjohn2013-06-252-15/+45
| | | | | | | | | | | | | | | I'm defining a new class which modularizes how the `rake test` tasks are defined and invoked.
* | | Remove deprecated `config.whiny_nils`Vipul A M2013-07-021-3/+0
| | |
* | | Merge pull request #11220 from aditya-kapoor/add-concernCarlos Antonio da Silva2013-07-011-4/+3
|\ \ \ | | | | | | | | Change Rails Migration generator module to use AS::Concern
| * | | Using ActiveSupport::Concern instead of plain regular Ruby hooks in ↵aditya-kapoor2013-07-011-4/+3
| | | | | | | | | | | | | | | | railties/lib/rails/generators/migration.rb file
* | | | Merge pull request #11203 from schneems/schneems/plugin_new-pluginRafael Mendonça França2013-07-0132-13/+13
|\ \ \ \ | |/ / / |/| | | s/plugin_new/plugin
| * | | s/plugin_new/pluginschneems2013-06-3032-13/+13
| | | | | | | | | | | | | | | | | | | | There are historical reasons that the `plugin` command was `plugin_new`, now those are no longer applicable, we should remove the naming edge case from the project. This PR is based off of comments from #11176 ATP Railties
* | | | Allowing multiple rails applications in the same ruby instance.wangjohn2013-06-301-7/+78
|/ / / | | | | | | | | | | | | This change provides the ability to create a new application with a configuration which can be specified.
* | | Merge pull request #11176 from schneems/schneems/plugin_new_help_fixRafael Mendonça França2013-06-291-9/+7
|\ \ \ | | | | | | | | Fix `rails plugin --help`
| * | | Fix `rails plugin --help`schneems2013-06-291-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now if you run the `rails plugin --help` command it fails because rails expects a command in `railties/lib/rails/commands/plugin.rb` that does not exist because the file is named `plugin_new`. This is the error: ``` ruby-2.0.0-p0 ~/documents/projects/tmp/vanilla (master) $ rails plugin --help /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require': cannot load such file -- rails/commands/plugin (LoadError) from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `block in require' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:213:in `load_dependency' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/railties-4.0.0/lib/rails/commands.rb:49:in `<top (required)>' from bin/rails:4:in `require' from bin/rails:4:in `<main>' ```
* | | | Update a broken link into the fixtures' templateRobin Dupret2013-06-291-1/+1
|/ / /
* / / Omit turbolinks configuration completely on skip_javascript generator optionNikita Fedyashev2013-06-281-0/+5
|/ /
* | Fix punctuation in config templatesAkira Matsuda2013-06-281-1/+1
| |
* | Removing deprecation message and silencing method.wangjohn2013-06-261-18/+0
|/ | | | | | | | The deprecation rake task is no longer useful because the deprecated methods have already been removed. The method for silencing stderr has been removed since it was only useful for `rake test:uncommitted` which was deprecated and removed.
* Removing deprecated rake tasks.wangjohn2013-06-241-62/+0
| | | | | The `rake test:recent` and `rake test:uncommitted` tasks were deprecated and are now being removed.