Removed unnecessary space in application.rb for formatting

3b23759a · Andrew Davis · 9b679187 · 3b23759a · 3b23759a · 3b23759a
9 changed file
--- a/.idea/.name
+++ b/.idea/.name
+rails
\ No newline at end of file
--- a/.idea/.rakeTasks
+++ b/.idea/.rakeTasks
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build gem files for all projects" fullCmd="build" taksId="build" /><RakeTask description="Remove rdoc products" fullCmd="clobber_rdoc" taksId="clobber_rdoc" /><RakeTask description="Run all tests by default" fullCmd="default" taksId="default" /><RakeTask description="Run gem task for all projects" fullCmd="gem" taksId="gem" /><RakeTask description="Install gems for all projects" fullCmd="install" taksId="install" /><RakeTask description="Run package task for all projects" fullCmd="package" taksId="package" /><RakeTask description="Publishes docs, run this AFTER a new stable tag has been pushed" fullCmd="publish_docs" taksId="publish_docs" /><RakeTask description="Build the rdoc HTML Files" fullCmd="rdoc" taksId="rdoc" /><RakeTask description="Release all gems to gemcutter and create a tag" fullCmd="release" taksId="release" /><RakeTask description="Force a rebuild of the RDOC files" fullCmd="rerdoc" taksId="rerdoc" /><RakeTask description="Smoke-test all projects" fullCmd="smoke" taksId="smoke" /><RakeTask description="Run test task for all projects" fullCmd="test" taksId="test" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="Run test:isolated task for all projects" fullCmd="test:isolated" taksId="isolated" /></RakeGroup><RakeTask description="Bump all versions to match version.rb" fullCmd="update_versions" taksId="update_versions" /><RakeGroup description="" fullCmd="" taksId="actionmailer"><RakeTask description="" fullCmd="actionmailer:build" taksId="build" /><RakeTask description="" fullCmd="actionmailer:clean" taksId="clean" /><RakeTask description="" fullCmd="actionmailer:dist/actionmailer-3.1.0.rc1.gem" taksId="dist/actionmailer-3.1.0.rc1.gem" /><RakeTask description="" fullCmd="actionmailer:install" taksId="install" /><RakeTask description="" fullCmd="actionmailer:prep_release" taksId="prep_release" /><RakeTask description="" fullCmd="actionmailer:push" taksId="push" /><RakeTask description="" fullCmd="actionmailer:update_version_rb" taksId="update_version_rb" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="actionpack"><RakeTask description="" fullCmd="actionpack:build" taksId="build" /><RakeTask description="" fullCmd="actionpack:clean" taksId="clean" /><RakeTask description="" fullCmd="actionpack:dist/actionpack-3.1.0.rc1.gem" taksId="dist/actionpack-3.1.0.rc1.gem" /><RakeTask description="" fullCmd="actionpack:install" taksId="install" /><RakeTask description="" fullCmd="actionpack:prep_release" taksId="prep_release" /><RakeTask description="" fullCmd="actionpack:push" taksId="push" /><RakeTask description="" fullCmd="actionpack:update_version_rb" taksId="update_version_rb" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="activemodel"><RakeTask description="" fullCmd="activemodel:build" taksId="build" /><RakeTask description="" fullCmd="activemodel:clean" taksId="clean" /><RakeTask description="" fullCmd="activemodel:dist/activemodel-3.1.0.rc1.gem" taksId="dist/activemodel-3.1.0.rc1.gem" /><RakeTask description="" fullCmd="activemodel:install" taksId="install" /><RakeTask description="" fullCmd="activemodel:prep_release" taksId="prep_release" /><RakeTask description="" fullCmd="activemodel:push" taksId="push" /><RakeTask description="" fullCmd="activemodel:update_version_rb" taksId="update_version_rb" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="activerecord"><RakeTask description="" fullCmd="activerecord:build" taksId="build" /><RakeTask description="" fullCmd="activerecord:clean" taksId="clean" /><RakeTask description="" fullCmd="activerecord:dist/activerecord-3.1.0.rc1.gem" taksId="dist/activerecord-3.1.0.rc1.gem" /><RakeTask description="" fullCmd="activerecord:install" taksId="install" /><RakeTask description="" fullCmd="activerecord:prep_release" taksId="prep_release" /><RakeTask description="" fullCmd="activerecord:push" taksId="push" /><RakeTask description="" fullCmd="activerecord:update_version_rb" taksId="update_version_rb" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="activeresource"><RakeTask description="" fullCmd="activeresource:build" taksId="build" /><RakeTask description="" fullCmd="activeresource:clean" taksId="clean" /><RakeTask description="" fullCmd="activeresource:dist/activeresource-3.1.0.rc1.gem" taksId="dist/activeresource-3.1.0.rc1.gem" /><RakeTask description="" fullCmd="activeresource:install" taksId="install" /><RakeTask description="" fullCmd="activeresource:prep_release" taksId="prep_release" /><RakeTask description="" fullCmd="activeresource:push" taksId="push" /><RakeTask description="" fullCmd="activeresource:update_version_rb" taksId="update_version_rb" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="activesupport"><RakeTask description="" fullCmd="activesupport:build" taksId="build" /><RakeTask description="" fullCmd="activesupport:clean" taksId="clean" /><RakeTask description="" fullCmd="activesupport:dist/activesupport-3.1.0.rc1.gem" taksId="dist/activesupport-3.1.0.rc1.gem" /><RakeTask description="" fullCmd="activesupport:install" taksId="install" /><RakeTask description="" fullCmd="activesupport:prep_release" taksId="prep_release" /><RakeTask description="" fullCmd="activesupport:push" taksId="push" /><RakeTask description="" fullCmd="activesupport:update_version_rb" taksId="update_version_rb" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="all"><RakeTask description="" fullCmd="all:build" taksId="build" /><RakeTask description="" fullCmd="all:commit" taksId="commit" /><RakeTask description="" fullCmd="all:ensure_clean_state" taksId="ensure_clean_state" /><RakeTask description="" fullCmd="all:install" taksId="install" /><RakeTask description="" fullCmd="all:push" taksId="push" /><RakeTask description="" fullCmd="all:release" taksId="release" /><RakeTask description="" fullCmd="all:tag" taksId="tag" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="changelog"><RakeTask description="" fullCmd="changelog:release_date" taksId="release_date" /><RakeTask description="" fullCmd="changelog:release_summary" taksId="release_summary" /></RakeGroup><RakeTask description="" fullCmd="clobber" taksId="clobber" /><RakeTask description="" fullCmd="dist" taksId="dist" /><RakeTask description="" fullCmd="doc" taksId="doc" /><RakeTask description="" fullCmd="doc/rdoc" taksId="doc/rdoc" /><RakeTask description="" fullCmd="doc/rdoc/index.html" taksId="doc/rdoc/index.html" /><RakeTask description="" fullCmd="file" taksId="file" /><RakeGroup description="" fullCmd="" taksId="rails"><RakeTask description="" fullCmd="rails:build" taksId="build" /><RakeTask description="" fullCmd="rails:clean" taksId="clean" /><RakeTask description="" fullCmd="rails:dist/rails-3.1.0.rc1.gem" taksId="dist/rails-3.1.0.rc1.gem" /><RakeTask description="" fullCmd="rails:install" taksId="install" /><RakeTask description="" fullCmd="rails:prep_release" taksId="prep_release" /><RakeTask description="" fullCmd="rails:push" taksId="push" /><RakeTask description="" fullCmd="rails:update_version_rb" taksId="update_version_rb" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="railties"><RakeTask description="" fullCmd="railties:build" taksId="build" /><RakeTask description="" fullCmd="railties:clean" taksId="clean" /><RakeTask description="" fullCmd="railties:dist/railties-3.1.0.rc1.gem" taksId="dist/railties-3.1.0.rc1.gem" /><RakeTask description="" fullCmd="railties:install" taksId="install" /><RakeTask description="" fullCmd="railties:prep_release" taksId="prep_release" /><RakeTask description="" fullCmd="railties:push" taksId="push" /><RakeTask description="" fullCmd="railties:update_version_rb" taksId="update_version_rb" /></RakeGroup></RakeGroup></Settings>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="ruby-1.9.2-p180" project-jdk-type="RUBY_SDK" />
+</project>
+
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/rails.iml" filepath="$PROJECT_DIR$/.idea/rails.iml" />
+    </modules>
+  </component>
+</project>
+
--- a/.idea/rails.iml
+++ b/.idea/rails.iml
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="GemRequirementsHolder" version="3">
+    <requirement>
+      <requirement>
+        <dependency name="RedCloth" version="4.2" bound="LATEST_IN_BRANCH" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="activerecord-oracle_enhanced-adapter" version="0" bound="GREATER_OR_EQUAL" git="true" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="activerecord-oracle_enhanced-adapter" version="0" bound="GREATER_OR_EQUAL" url="file://$MODULE_DIR$" git="false" path="true" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="arel" version="0" bound="GREATER_OR_EQUAL" url="file://$MODULE_DIR$" git="false" path="true" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="arel" version="2.1.0" bound="LATEST_IN_BRANCH" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="bundler" version="1.0" bound="LATEST_IN_BRANCH" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="coffee-script" version="0" bound="GREATER_OR_EQUAL" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="horo" version="1.0.3" bound="EQUAL" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="memcache-client" version="1.8.5" bound="GREATER_OR_EQUAL" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="mocha" version="0.9.8" bound="GREATER_OR_EQUAL" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="rake" version="0.8.7" bound="GREATER_OR_EQUAL" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="rdoc" version="3.4" bound="LATEST_IN_BRANCH" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="ruby-debug19" version="0" bound="GREATER_OR_EQUAL" lib="ruby-debug" git="false" path="false" platform="mri_19" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="sass" version="0" bound="GREATER_OR_EQUAL" git="false" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+    <requirement>
+      <requirement>
+        <dependency name="uglifier" version="0" bound="GREATER_OR_EQUAL" git="true" path="false" doRequire="true" />
+      </requirement>
+      <source from="Gemfile" />
+    </requirement>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] bundler (v1.0.12, C:/Ruby192/lib/ruby/gems/1.9.1/gems/bundler-1.0.12)" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] uglifier (v0.5.4, C:/Ruby192/lib/ruby/gems/1.9.1/gems/uglifier-0.5.4)" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] rake (v0.9.0, C:/Ruby192/lib/ruby/gems/1.9.1/gems/rake-0.9.0)" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] coffee-script (v2.2.0, C:/Ruby192/lib/ruby/gems/1.9.1/gems/coffee-script-2.2.0)" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] arel (v2.1.1, C:/Ruby192/lib/ruby/gems/1.9.1/gems/arel-2.1.1)" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] sass (v3.1.1, C:/Ruby192/lib/ruby/gems/1.9.1/gems/sass-3.1.1)" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] multi_json (v1.0.3, C:/Ruby192/lib/ruby/gems/1.9.1/gems/multi_json-1.0.3)" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] coffee-script-source (v1.1.1, C:/Ruby192/lib/ruby/gems/1.9.1/gems/coffee-script-source-1.1.1)" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="[gem] execjs (v1.0.0, C:/Ruby192/lib/ruby/gems/1.9.1/gems/execjs-1.0.0)" level="application" />
+  </component>
+</module>
+
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
+
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="d4ed5cdf-2a78-444b-913c-f4b450ea5825" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/railties/lib/rails/generators/rails/app/templates/config/application.rb" afterPath="$PROJECT_DIR$/railties/lib/rails/generators/rails/app/templates/config/application.rb" />
+    </list>
+    <ignored path="rails.iws" />
+    <ignored path=".idea/workspace.xml" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="CoverageDataManager" choice="3" />
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+    <option name="REVERSE_PATCH" value="false" />
+  </component>
+  <component name="DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="rails" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="application.rb" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/railties/lib/rails/generators/rails/app/templates/config/application.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="6" column="37" selection-start="180" selection-end="180" vertical-scroll-proportion="0.21857923">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindManager">
+    <FindUsagesManager>
+      <setting name="OPEN_NEW_TAB" value="false" />
+    </FindUsagesManager>
+  </component>
+  <component name="Git.Settings">
+    <option name="CHECKOUT_INCLUDE_TAGS" value="false" />
+    <option name="UPDATE_CHANGES_POLICY" value="STASH" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="changedFiles">
+      <list>
+        <option value="$PROJECT_DIR$/railties/lib/rails/generators/rails/app/templates/config/application.rb" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectReloadState">
+    <option name="STATE" value="0" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rails" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rails" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="rails" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Favorites" />
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="RunManager">
+    <list size="0" />
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="SvnConfiguration" maxAnnotateRevisions="500">
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="LAST_MERGED_REVISION" />
+    <option name="MERGE_DRY_RUN" value="false" />
+    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+    <option name="IGNORE_SPACES_IN_MERGE" value="false" />
+    <option name="DETECT_NESTED_COPIES" value="true" />
+    <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
+    <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
+    <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
+    <option name="FORCE_UPDATE" value="false" />
+    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <created>1306364491872</created>
+      <updated>1306364491872</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32998884" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24969843" sideWeight="0.67001116" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+    </layout>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
+    <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
+    <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
+    <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
+    <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
+    <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
+    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+    <option name="ACTIVE_VCS_NAME" />
+    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/railties/lib/rails/generators/rails/app/templates/config/application.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="37" selection-start="180" selection-end="180" vertical-scroll-proportion="0.21857923">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
+
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -4,7 +4,7 @@
 require 'rails/all'
 <% else -%>
 # Pick the frameworks you want:
-<%= comment_if :skip_active_record %> require "active_record/railtie"
+<%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"