Gitignore update for some IntelliJ stuff

Roux Heyns · Roux Heyns · commit d4dc533a534b · 2013-02-12T22:37:23.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,6 @@ pickle-email-*.html
 solr
 .DS_Store
 *.swp
-.idea
+*.iml
+.idea*
 config/database.yml
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/CauseRoot.iml b/CauseRoot.iml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="JRUBY" name="JRuby">
+      <configuration>
+        <JRUBY_FACET_CONFIG_ID NAME="JRUBY_SDK_NAME" VALUE="" />
+        <LOAD_PATH number="0" />
+        <I18N_FOLDERS number="0" />
+      </configuration>
+      <facet type="JRailsFacetType" name="JRuby on Rails">
+        <configuration>
+          <RAILS_FACET_CONFIG_ID NAME="RAILS_FACET_SUPPORT_REMOVED" VALUE="false" />
+          <RAILS_FACET_CONFIG_ID NAME="RAILS_TESTS_SOURCES_PATCHED" VALUE="true" />
+          <RAILS_FACET_CONFIG_ID NAME="RAILS_FACET_APPLICATION_ROOT" VALUE="$MODULE_DIR$" />
+        </configuration>
+      </facet>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="RModuleSettingsStorage">
+    <LOAD_PATH number="0" />
+    <I18N_FOLDERS number="1" string0="$MODULE_DIR$/config/locales" />
+  </component>
+</module>
+
diff --git a/public/graphs.html b/public/graphs.html
@@ -192,7 +192,7 @@
 /* This path interpolates along any path in color space smoothly!*/
 function cinterp (t) {
     var cl = ['#2FBF19', '#737223', '#F2C449', '#7A4520', '#CC322D'];
-    idx = Math.floor(t * (cl.length-1));
+    var idx = Math.floor(t * (cl.length-1));
     if (idx >= (cl.length-1)) {
         return cl[cl.length-1];
     }
diff --git a/spec/controllers/game_results_controller_spec.rb b/spec/controllers/game_results_controller_spec.rb
diff --git a/spec/controllers/issues_controller_spec.rb b/spec/controllers/issues_controller_spec.rb
@@ -44,7 +44,7 @@ def valid_session
       pending "We need to hook up issues"
       issue = Issue.create! valid_attributes
       get :index, {}, valid_session
-      assigns(:issues).should eq([issue])
+      assigns(:issues).should not eq([issue])
     end
   end
 

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@`
`192`	`192`	`/* This path interpolates along any path in color space smoothly!*/`
`193`	`193`	`function cinterp (t) {`
`194`	`194`	`var cl = ['#2FBF19', '#737223', '#F2C449', '#7A4520', '#CC322D'];`
`195`		`- idx = Math.floor(t * (cl.length-1));`
	`195`	`+ var idx = Math.floor(t * (cl.length-1));`
`196`	`196`	`if (idx >= (cl.length-1)) {`
`197`	`197`	`return cl[cl.length-1];`
`198`	`198`	`}`