Commit Graph

4256 Commits

Author SHA1 Message Date
Łukasz Strzałkowski
1b1c23599b Add --skip-action-view to app generator 2013-08-25 11:39:13 +02:00
Łukasz Strzałkowski
c9ffd73968 Include AV railtie when we're not loading full rails stack 2013-08-25 11:39:13 +02:00
Łukasz Strzałkowski
b2ae1fae5d Add loading 'action_view' as part of rails/all 2013-08-25 11:39:07 +02:00
Semyon Perepelitsa
d1f33e0963 Fix typo in file path, should include extension. 2013-08-23 16:16:05 +04:00
Rafael Mendonça França
a0b948e9f5 Fix the indentation on the from template of the scaffold generator 2013-08-19 10:52:01 -03:00
Vijay Dev
9abe72c760 Merge branch 'master' of github.com:rails/docrails
Conflicts:
	actionview/README.rdoc
	activerecord/lib/active_record/migration.rb
	guides/source/development_dependencies_install.md
	guides/source/getting_started.md
2013-08-17 21:49:16 +05:30
Vijay Dev
ec8ef1e105 Revert "Merge branch 'master' of github.com:rails/docrails"
This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing
changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9.

Seems to be a code merge done by mistake.
2013-08-17 21:46:39 +05:30
Josh Crowder
f3073773a3 Adding LESS to rake notes 2013-08-15 11:30:01 +01:00
Prathamesh Sonpatki
53c5794a4b Generate namespaced routes correctly for generators. Fix for #11532 2013-08-14 08:53:38 +05:30
Avner Cohen
86f2061cd5 Revert "Removing obsolete html tags in favor of markdown code block"
This reverts commit 157dc275da0ad38635337b7c1d96de656d91de8e.
2013-08-06 22:16:03 +03:00
Avner Cohen
157dc275da Removing obsolete html tags in favor of markdown code block. 2013-08-06 21:20:33 +03:00
thedarkone
a0907bbdad "Naked" rescue clauses only catch StandardError subclasses.
Similar to #11497.
2013-08-06 17:04:02 +02:00
Rafael Mendonça França
d86ccec097 Use the right instrumentation name
The pattern is event.component

Closes #11769

Conflicts:
	railties/CHANGELOG.md
2013-08-05 18:20:22 -03:00
Rafael Mendonça França
067393895d Merge pull request #11665 from mshytikov/fix-config-log_level
Rails.logger should have level specified by config.log_level.
2013-08-04 07:34:45 -07:00
Arun Agrawal
65624e9030 Added action_view in Rails::Info 2013-08-02 10:30:04 -04:00
Rafael Mendonça França
ffb680e121 Merge pull request #11601 from TylerRick/dont_permanently_silence_all_warnings
Remove $VERBOSE = nil from tasks.rb
2013-07-30 19:00:04 -07:00
Max Shytikov
e2180e84a9 Rails.logger should have level specified by config.log_level.
Fix bug when log level of Rails.logger (which was set via config.logger) does not match the    config.log_level.
2013-07-30 18:25:00 +03:00
Pawel Janiak
f18aecfe7b Changed stylesheet load order in the stylesheet manifest generator. 2013-07-28 15:05:17 +02:00
Arun Agrawal
1e384f82b0 Removed excluding vendor from API doc [ci skip]
These folder not exists in system
2013-07-26 12:21:53 +02:00
Arun Agrawal
e32576ae52 Excluding action_view/vendor in API [ci skip] 2013-07-26 12:03:53 +02:00
Tyler Rick
9affba83f5 Remove $VERBOSE = nil from tasks.rb
Permanently setting $VERBOSE to nil causes unwanted side effects (warnings generated by app code are
silenced when triggered by a rake task but visible otherwise). silence_warnings {} would be safer to
use here since it resets $VERBOSE back to what it was when the block finishes.
2013-07-25 11:54:24 -07:00
Aaron Patterson
d7fc97d3f9 grab executable from rubygems 2013-07-25 10:01:19 -07:00
Akira Matsuda
44f785357c Use Ruby 2.0 caller_locations instead of caller if available
* we no more have to manipulate the each caller strings by ourselves using caller_locations

* caller_locations runs slightly faster, and creates less objects than good old caller
Benchmark (loading an Engine 1000 times):
  caller: 262.89 ms
  caller_locations: 186.068 ms
2013-07-25 17:13:53 +09:00
Zachary Scott
b017562382 Use GeneratedAttribute#column_name if #reference? scaffold_generator in _form view [Fixes #11573] 2013-07-23 18:06:44 -03:00
Piotr Sarnacki
73bbf54868 Revert "Match Dev/Prod parity for Index Page"
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.
2013-07-22 17:19:07 +02:00
Piotr Sarnacki
230d2f84a1 Merge pull request #11514 from schneems/schneems/dev-prod-parity-index
Match Dev/Prod parity for Index Page
2013-07-22 03:25:27 -07:00
Vijay Dev
3613235cc3 Merge branch 'master' of github.com:rails/docrails 2013-07-21 18:08:43 +05:30
schneems
b0caea29c2 Match Dev/Prod parity for Index Page
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.
2013-07-20 14:56:10 -05:00
Prathamesh Sonpatki
e33defcec8 Removed information about creating database[ci skip]
- 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
2013-07-20 20:22:09 +05:30
Damien Mathieu
bae07dcce2 use the appropriate RDoc code markup
Thanks @fxn
2013-07-18 17:15:11 +02:00
Damien Mathieu
3c6767cade document the Rails::ConsoleMethods#helper and #controller methods
Closes rails/rails#11362
2013-07-18 16:18:07 +02:00
Burkhard Vogel-Kreykenbohm
ad62cf68f8 bcrypt-ruby stable is 3.1 2013-07-17 16:39:07 +02:00
Arun Agrawal
0b5b32ef27 Fixed USAGE file for generator [ci skip] 2013-07-16 14:09:19 +02:00
Josef Šimánek
5ecd125a62 Added generated unit test for generator generator and new test:generators rake task included in test:all rake task. 2013-07-16 09:38:13 +02:00
Santiago Pastorino
207fa5c11d Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"
This reverts commit 19ac034bdc9be175eff7cf54208ba14b43d97681.
And allows webservers to configure X-Sendfile-Type.

Closes #11440 thanks to [@MSch]

Conflicts:
	railties/lib/rails/application.rb
2013-07-15 01:20:49 -03:00
Xavier Noria
1e403f1d6d Merge pull request #11425 from arunagw/actionview_api_generation
Actionview api generation
2013-07-14 04:55:20 -07:00
Arun Agrawal
d4e1fcf7e5 Added actionview in API generation [ci skip]
CHANGELOG and LICENSE removed as suggested
2013-07-14 09:44:58 +02:00
Santiago Pastorino
ba8b55f791 This is not needed anymore, before_initialize block can access config 2013-07-14 01:54:33 -03:00
Josef Šimánek
8e1656e76f Remove update:application_controller rake task. 2013-07-13 14:44:06 +02:00
José Valim
e7e81b4580 Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompile
#11381: Ignore config.eager_load=true for rake
2013-07-10 11:46:17 -07:00
Paul Nikitochkin
9cac69c602 #11381: Ignore config.eager_load=true for rake
Closes #11381
2013-07-10 21:43:15 +03:00
Rafael Mendonça França
54d893f9d8 Merge pull request #11385 from MarceloCajueiro/remove_string_interpolation
Remove unnecessary string interpolation
2013-07-09 19:56:56 -07:00
Marcelo G. Cajueiro
07e7c099b5 Remove unnecessary string interpolation
Removed from controller template of scaffold generator.
2013-07-09 21:30:34 -03:00
Rafael Mendonça França
37d1e48dfe Merge pull request #11378 from wangjohn/class_for_application_generator
Creating a class to handle preparing ARGV.
2013-07-09 06:14:06 -07:00
wangjohn
929e5b5b8b Creating a class to handle preparing ARGV.
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.
2013-07-09 08:29:07 -04:00
wangjohn
0c5d8f813c Using the instance variable for argv.
Instead of using the global constant ARGV, we're changing to using the
instance variable because it is more testable.
2013-07-09 08:21:54 -04:00
Rafael Mendonça França
b025fca0c5 Merge pull request #11355 from wangjohn/class_for_rails_commands
Creating a class for carrying out rails commands.
2013-07-08 08:39:34 -07:00
Yuri Artemev
dd996ad394 handle notes in *.sass files 2013-07-08 19:13:01 +04:00
wangjohn
f1f249d836 Creating a class for carrying out rails commands.
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.
2013-07-07 23:15:55 -07:00
Xavier Noria
374fd6693a fixes Rails version for the stable API [ci skip] 2013-07-06 22:42:24 +02:00