Permalink
Browse files

fix session store"

  • Loading branch information...
1 parent ce19039 commit 990ebe53474f8a39b9be8ebfb4020b170f31d969 @pghodgman committed Sep 15, 2013
Showing with 85 additions and 45 deletions.
  1. +84 −44 .idea/workspace.xml
  2. +1 −1 config/initializers/session_store.rb
View
@@ -79,20 +79,13 @@
</provider>
</entry>
</file>
- <file leaf-file-name="locations_controller.rb" pinned="false" current="false" current-in-tab="false">
- <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">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="model_processor.rb" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/io/model_processor.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="200" column="56" selection-start="5824" selection-end="5824" vertical-scroll-proportion="0.0">
- <folding />
+ <folding>
+ <marker date="1379255705000" expanded="true" signature="5296:5845" placeholder=" ... end" />
+ </folding>
</state>
</provider>
</entry>
@@ -109,43 +102,52 @@
<file leaf-file-name="deploy.rb" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/deploy.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="52" selection-start="86" selection-end="86" vertical-scroll-proportion="0.0">
+ <state line="34" column="60" selection-start="958" selection-end="958" vertical-scroll-proportion="0.0">
<folding />
</state>
</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="20" column="67" selection-start="478" selection-end="478" vertical-scroll-proportion="0.5588235">
+ <state line="10" column="17" selection-start="242" selection-end="252" 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="session_store.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/config/initializers/session_store.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="3" column="83" selection-start="151" selection-end="151" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="20130915143011_add_model_meta_data.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/migrate/20130915143011_add_model_meta_data.rb">
+ <file leaf-file-name="production.rb" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/config/environments/production.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="60" selection-start="213" selection-end="213" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.2289916">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="20130915140035_add_preview_to_model.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/migrate/20130915140035_add_preview_to_model.rb">
+ <file leaf-file-name="Gemfile.lock" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Gemfile.lock">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="61" selection-start="116" selection-end="116" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="20130915143011_add_model_meta_data.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/db/migrate/20130915143011_add_model_meta_data.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="7" column="60" selection-start="213" selection-end="213" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -161,7 +163,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/app/models/body.rb" />
<option value="$PROJECT_DIR$/app/models/transform.rb" />
<option value="$PROJECT_DIR$/db/migrate/20130913165405_add_transform_foriegn_key.rb" />
<option value="$PROJECT_DIR$/db/migrate/20130913173726_add_foreign_key_to_location.rb" />
@@ -177,6 +178,7 @@
<option value="$PROJECT_DIR$/app/io/model_processor.rb" />
<option value="$PROJECT_DIR$/config/deploy.rb" />
<option value="$PROJECT_DIR$/Gemfile" />
+ <option value="$PROJECT_DIR$/config/initializers/session_store.rb" />
</list>
</option>
</component>
@@ -292,6 +294,42 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="config" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="initializers" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osprey-model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osprey-model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="config" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="environments" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osprey-model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osprey-model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -620,7 +658,7 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="1440" height="813" extended-state="0" />
+ <frame x="0" y="22" width="1440" height="813" 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="7" side_tool="false" content_ui="tabs" />
@@ -705,20 +743,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/models/model.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="4" column="0" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/.rvm/gems/ruby-2.0.0-p0/gems/actionpack-4.0.0.beta1/lib/action_controller/metal/rescue.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="31" column="0" selection-start="1117" selection-end="1117" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$USER_HOME$/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0.beta1/lib/active_support/notifications/instrumenter.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="21" column="0" selection-start="577" selection-end="577" vertical-scroll-proportion="0.0">
@@ -785,7 +809,9 @@
<entry file="file://$PROJECT_DIR$/app/io/model_processor.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="200" column="56" selection-start="5824" selection-end="5824" vertical-scroll-proportion="0.0">
- <folding />
+ <folding>
+ <marker date="1379255705000" expanded="true" signature="5296:5845" placeholder=" ... end" />
+ </folding>
</state>
</provider>
</entry>
@@ -796,23 +822,37 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/config/deploy.rb">
+ <entry file="file://$PROJECT_DIR$/Gemfile.lock">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="52" selection-start="86" selection-end="86" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Gemfile.lock">
+ <entry file="file://$PROJECT_DIR$/config/deploy.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="34" column="60" selection-start="958" selection-end="958" 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="20" column="67" selection-start="478" selection-end="478" vertical-scroll-proportion="0.5588235">
+ <state line="10" column="17" selection-start="242" selection-end="252" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/config/initializers/session_store.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="3" column="83" selection-start="151" selection-end="151" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/config/environments/production.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.2289916">
<folding />
</state>
</provider>
@@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file.
-OspreyModel::Application.config.session_store :encrypted_cookie_store, key: '_osprey-model_session'
+OspreyModel::Application.config.session_store :cookie_store, key: '_osprey-model_session'

0 comments on commit 990ebe5

Please sign in to comment.