aboutsummaryrefslogtreecommitdiffstats
path: root/railties/configs
diff options
context:
space:
mode:
Diffstat (limited to 'railties/configs')
-rwxr-xr-xrailties/configs/apache.conf2
-rw-r--r--railties/configs/databases/mysql.yml2
-rw-r--r--railties/configs/initializers/inflections.rb2
-rw-r--r--railties/configs/initializers/mime_types.rb2
-rw-r--r--railties/configs/routes.rb8
5 files changed, 8 insertions, 8 deletions
diff --git a/railties/configs/apache.conf b/railties/configs/apache.conf
index d3c9983451..d9d211c058 100755
--- a/railties/configs/apache.conf
+++ b/railties/configs/apache.conf
@@ -37,4 +37,4 @@ RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
# Example:
# ErrorDocument 500 /500.html
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly" \ No newline at end of file
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
diff --git a/railties/configs/databases/mysql.yml b/railties/configs/databases/mysql.yml
index b7e01dac78..b3525663bf 100644
--- a/railties/configs/databases/mysql.yml
+++ b/railties/configs/databases/mysql.yml
@@ -45,4 +45,4 @@ production:
socket: <%= socket %>
<% else -%>
host: localhost
-<% end -%> \ No newline at end of file
+<% end -%>
diff --git a/railties/configs/initializers/inflections.rb b/railties/configs/initializers/inflections.rb
index a372f170b5..3bf26a7f55 100644
--- a/railties/configs/initializers/inflections.rb
+++ b/railties/configs/initializers/inflections.rb
@@ -5,4 +5,4 @@
# inflect.singular /^(ox)en/i, '\1'
# inflect.irregular 'person', 'people'
# inflect.uncountable %w( fish sheep )
-# end \ No newline at end of file
+# end
diff --git a/railties/configs/initializers/mime_types.rb b/railties/configs/initializers/mime_types.rb
index 43fde08ce5..af12e9d449 100644
--- a/railties/configs/initializers/mime_types.rb
+++ b/railties/configs/initializers/mime_types.rb
@@ -1,3 +1,3 @@
# Add new mime types for use in respond_to blocks:
# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register "application/x-mobile", :mobile \ No newline at end of file
+# Mime::Type.register "application/x-mobile", :mobile
diff --git a/railties/configs/routes.rb b/railties/configs/routes.rb
index ee6ff5d3dd..ef0c8e8d2a 100644
--- a/railties/configs/routes.rb
+++ b/railties/configs/routes.rb
@@ -1,6 +1,6 @@
ActionController::Routing::Routes.draw do |map|
# The priority is based upon order of creation: first created -> highest priority.
-
+
# Sample of regular route:
# map.connect 'products/:id', :controller => 'catalog', :action => 'view'
# Keep in mind you can assign values other than :controller and :action
@@ -8,7 +8,7 @@ ActionController::Routing::Routes.draw do |map|
# Sample of named route:
# map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
# This route can be invoked with purchase_url(:id => product.id)
-
+
# Sample resource route (maps HTTP verbs to controller actions automatically):
# map.resources :products
@@ -16,7 +16,7 @@ ActionController::Routing::Routes.draw do |map|
# map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
# Sample resource route with sub-resources:
- # map.resources :products, :has_many => [ :comments, :sales ], :has_ony => :seller
+ # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
# You can have the root of your site routed with map.root -- just remember to delete public/index.html.
# map.root :controller => "welcome"
@@ -24,4 +24,4 @@ ActionController::Routing::Routes.draw do |map|
# Install the default routes as the lowest priority.
map.connect ':controller/:action/:id'
map.connect ':controller/:action/:id.:format'
-end \ No newline at end of file
+end