Permalink
Browse files

changes

  • Loading branch information...
1 parent 1932f94 commit 952291f672853f7fd7b5fe9935d61207a6329ab1 @pghodgman committed Sep 21, 2013
Showing with 54 additions and 37 deletions.
  1. +1 −0 .idea/osprey-model.iml
  2. +39 −34 .idea/workspace.xml
  3. +8 −1 Gemfile
  4. +2 −0 Gemfile.lock
  5. +2 −0 config/application.rb
  6. +2 −2 config/database.yml
@@ -41,6 +41,7 @@
<orderEntry type="library" scope="PROVIDED" name="minitest (v4.7.5, RVM: ruby-2.0.0-p247) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mono_logger (v1.1.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.8.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="polyglot (v0.3.3, RVM: ruby-2.0.0-p247) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, RVM: ruby-2.0.0-p247) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-protection (v1.5.0, RVM: ruby-2.0.0-p247) [gem]" level="application" />
View
@@ -43,6 +43,7 @@
<file path="/20130915143011_add_model_meta_data.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379255570038" ignored="false" />
<file path="/deploy.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379291360948" ignored="false" />
<file path="$PROJECT_DIR$/../../openid/omniauth/config/deploy.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379354119140" ignored="false" />
+ <file path="/database.yml" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379774127227" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -116,37 +117,37 @@
</provider>
</entry>
</file>
- <file leaf-file-name="Gemfile" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="Gemfile" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="34" selection-start="777" selection-end="777" vertical-scroll-proportion="1.0248448">
+ <state line="43" column="40" selection-start="943" selection-end="943" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="session_store.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/config/initializers/session_store.rb">
+ <file leaf-file-name="application.rb" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/config/application.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="3" column="0" selection-start="151" selection-end="151" vertical-scroll-proportion="0.0">
+ <state line="24" column="48" selection-start="1036" selection-end="1036" vertical-scroll-proportion="0.54711246">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="production.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/config/environments/production.rb">
+ <file leaf-file-name="database.yml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/config/database.yml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="0" selection-start="478" selection-end="478" vertical-scroll-proportion="0.0">
+ <state line="22" column="30" selection-start="549" selection-end="549" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Gemfile.lock" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Gemfile.lock">
+ <file leaf-file-name="production.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/config/environments/production.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="0" selection-start="97" selection-end="97" vertical-scroll-proportion="0.0">
+ <state line="11" column="0" selection-start="478" selection-end="478" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -162,8 +163,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/db/migrate/20130913173726_add_foreign_key_to_location.rb" />
- <option value="$PROJECT_DIR$/app/models/location.rb" />
<option value="$PROJECT_DIR$/app/models/model.rb" />
<option value="$PROJECT_DIR$/app/controllers/files_controller.rb" />
<option value="$PROJECT_DIR$/app/controllers/bodies_controller.rb" />
@@ -175,9 +174,11 @@
<option value="$PROJECT_DIR$/app/io/model_processor.rb" />
<option value="$PROJECT_DIR$/config/initializers/session_store.rb" />
<option value="$PROJECT_DIR$/Capfile" />
- <option value="$PROJECT_DIR$/Gemfile" />
<option value="$PROJECT_DIR$/public/hello.html" />
<option value="$PROJECT_DIR$/config/deploy.rb" />
+ <option value="$PROJECT_DIR$/config/database.yml" />
+ <option value="$PROJECT_DIR$/Gemfile" />
+ <option value="$PROJECT_DIR$/config/application.rb" />
</list>
</option>
</component>
@@ -192,7 +193,7 @@
<option name="x" value="-4" />
<option name="y" value="22" />
<option name="width" value="1440" />
- <option name="height" value="820" />
+ <option name="height" value="806" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@@ -411,14 +412,14 @@
<component name="PropertiesComponent">
<property name="options.splitter.main.proportions" value="0.3" />
<property name="WebServerToolWindowFactoryState" value="false" />
- <property name="recentsLimit" value="5" />
<property name="options.lastSelected" value="org.jetbrains.plugins.ruby.settings.RubyIdeSdkConfigurable" />
- <property name="restartRequiresConfirmation" value="true" />
+ <property name="recentsLimit" value="5" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../openid/omniauth" />
+ <property name="restartRequiresConfirmation" value="true" />
<property name="FullScreen" value="false" />
- <property name="options.splitter.details.proportions" value="0.2" />
- <property name="options.searchVisible" value="true" />
<property name="dynamic.classpath" value="false" />
+ <property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
</component>
<component name="RunManager" selected="Rails.Development: osprey-model">
<configuration default="true" type="RakeRunConfigurationType" factoryName="Rake">
@@ -713,14 +714,14 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-4" y="22" width="1440" height="820" extended-state="0" />
- <editor active="false" />
+ <frame x="-4" y="22" width="1440" height="806" extended-state="0" />
+ <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="7" 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.3278237" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" 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="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28120518" sideWeight="0.7385892" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28550932" sideWeight="0.7385892" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26068965" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3278237" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -799,16 +800,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/db/migrate/20130913173726_add_foreign_key_to_location.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="2" column="49" selection-start="73" selection-end="117" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/db/migrate/20130915140035_add_preview_to_model.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="5" column="61" selection-start="116" selection-end="116" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/controllers/locations_controller.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="92" selection-start="211" selection-end="343" vertical-scroll-proportion="0.0" />
@@ -831,7 +822,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/Gemfile.lock">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="0" selection-start="97" selection-end="97" vertical-scroll-proportion="0.0">
+ <state line="6" column="0" selection-start="119" selection-end="119" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -892,9 +883,23 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/config/database.yml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="22" column="30" selection-start="549" selection-end="549" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="34" selection-start="777" selection-end="777" vertical-scroll-proportion="1.0248448">
+ <state line="43" column="40" selection-start="943" selection-end="943" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/config/application.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="24" column="48" selection-start="1036" selection-end="1036" vertical-scroll-proportion="0.54711246">
<folding />
</state>
</provider>
View
@@ -3,7 +3,12 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.0.0'
-gem 'sqlite3'
+group :development, :test do
+ gem 'sqlite3'
+end
+group :production do
+ gem 'pg'
+end
gem 'coffee-script-source'
@@ -36,4 +41,6 @@ gem 'therubyracer', :platforms => :ruby
gem 'libv8'
+gem 'rails_12factor', group: :production
+
View
@@ -52,6 +52,7 @@ GEM
minitest (4.7.5)
mono_logger (1.1.0)
multi_json (1.8.0)
+ pg (0.17.0)
polyglot (0.3.3)
rack (1.5.2)
rack-protection (1.5.0)
@@ -130,6 +131,7 @@ DEPENDENCIES
jbuilder (~> 1.0.1)
jquery-rails
libv8
+ pg
rails (= 4.0.0)
resque
sass-rails (~> 4.0.0)
@@ -18,5 +18,7 @@ class Application < Rails::Application
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
+
+ config.assets.initialize_on_precompile = false
end
end
View
@@ -19,7 +19,7 @@ test:
timeout: 5000
production:
- adapter: sqlite3
- database: db/production.sqlite3
+ adapter: postgresql
+ database: db/production.postgresql
pool: 5
timeout: 5000

0 comments on commit 952291f

Please sign in to comment.