Permalink
Browse files

sidekiq

  • Loading branch information...
1 parent 338f6f4 commit ac7ea7a9ca357e90ac12a5f8e65276d36424c955 @nmaisonneuve committed May 21, 2012
Showing with 15 additions and 15 deletions.
  1. +14 −14 .idea/workspace.xml
  2. +1 −1 app/models/app.rb
View
28 .idea/workspace.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6ad8450-30bb-4e34-983c-de221ba7f1f7" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/apps_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/apps_controller.rb" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/app.rb" afterPath="$PROJECT_DIR$/app/models/app.rb" />
</list>
<ignored path="mechanicalmap.iws" />
<ignored path=".idea/workspace.xml" />
@@ -24,10 +24,10 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="app.rb" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="app.rb" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/models/app.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="25" selection-start="294" selection-end="302" vertical-scroll-proportion="0.0">
+ <state line="9" column="29" selection-start="258" selection-end="258" vertical-scroll-proportion="0.21640736">
<folding />
</state>
</provider>
@@ -69,10 +69,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="apps_controller.rb" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="apps_controller.rb" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/controllers/apps_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="100" column="40" selection-start="2469" selection-end="2469" vertical-scroll-proportion="0.26308346">
+ <state line="100" column="40" selection-start="2469" selection-end="2469" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -139,14 +139,14 @@
<option value="$PROJECT_DIR$/app/workers/gist_updater.rb" />
<option value="$PROJECT_DIR$/app/assets/stylesheets/bootstrap.min.css" />
<option value="$PROJECT_DIR$/Gemfile" />
- <option value="$PROJECT_DIR$/app/models/app.rb" />
<option value="$PROJECT_DIR$/app/workers/task_indexer.rb" />
<option value="$PROJECT_DIR$/config/deploy.rb" />
<option value="$PROJECT_DIR$/app/workers/ft_worker.rb" />
<option value="$PROJECT_DIR$/app/workers/ft_generator.rb" />
<option value="$PROJECT_DIR$/app/views/apps/new.html.erb" />
<option value="$PROJECT_DIR$/app/workers/ft_indexer.rb" />
<option value="$PROJECT_DIR$/app/controllers/apps_controller.rb" />
+ <option value="$PROJECT_DIR$/app/models/app.rb" />
</list>
</option>
</component>
@@ -902,13 +902,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/models/app.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="10" column="25" selection-start="294" selection-end="302" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/views/apps/new.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="47" column="34" selection-start="1621" selection-end="1621" vertical-scroll-proportion="0.0">
@@ -946,7 +939,14 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/controllers/apps_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="100" column="40" selection-start="2469" selection-end="2469" vertical-scroll-proportion="0.26308346">
+ <state line="100" column="40" selection-start="2469" selection-end="2469" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/models/app.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="9" column="29" selection-start="258" selection-end="258" vertical-scroll-proportion="0.21640736">
<folding />
</state>
</provider>
View
2 app/models/app.rb
@@ -7,7 +7,7 @@ class App < ActiveRecord::Base
has_many :contributors, :through => :answers, :source => :user, :uniq => true
belongs_to :user
- # validates_presence_of :name, :script
+ validates_presence_of :name
validates_presence_of :input_ft, :message => "The ID of the input fusion table can't be blank"
attr_accessible :name, :description, :output_ft, :input_ft, :script, :script_url, :ui_template

0 comments on commit ac7ea7a

Please sign in to comment.