Permalink
Browse files

adding thin

  • Loading branch information...
1 parent eeebdf6 commit 2d09f22443cec0a924a8ec6aede20aadc82f6a60 @pghodgman committed Aug 16, 2013
Showing with 26 additions and 14 deletions.
  1. +3 −0 .idea/omniauth.iml
  2. +14 −14 .idea/workspace.xml
  3. +2 −0 Gemfile
  4. +7 −0 Gemfile.lock
View
@@ -29,7 +29,9 @@
<orderEntry type="library" scope="PROVIDED" name="coffee-rails (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="coffee-script (v2.2.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="coffee-script-source (v1.6.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="daemons (v1.1.9, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="eventmachine (v0.12.10, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="execjs (v1.4.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="hashie (v2.0.5, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="hike (v1.2.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
@@ -60,6 +62,7 @@
<orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v2.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.3.7, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.11.4, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="thin (v1.4.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thor (v0.18.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.1.2, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="tilt (v1.4.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
View
@@ -4,7 +4,7 @@
<list default="true" id="8df6c214-4039-4834-b9e9-5cc7da80f82d" name="Default" comment="" />
<ignored path="omniauth.iws" />
<ignored path=".idea/workspace.xml" />
- <file path="/Gemfile" changelist="8df6c214-4039-4834-b9e9-5cc7da80f82d" time="1376577574248" ignored="false" />
+ <file path="/Gemfile" changelist="8df6c214-4039-4834-b9e9-5cc7da80f82d" time="1376661205880" ignored="false" />
<file path="/sessions_controller.rb" changelist="8df6c214-4039-4834-b9e9-5cc7da80f82d" time="1376315898079" ignored="false" />
<file path="/routes.rb" changelist="8df6c214-4039-4834-b9e9-5cc7da80f82d" time="1376076452678" ignored="false" />
<file path="/Dummy.txt" changelist="8df6c214-4039-4834-b9e9-5cc7da80f82d" time="1376586650820" ignored="false" />
@@ -52,19 +52,19 @@
</provider>
</entry>
</file>
- <file leaf-file-name="home_controller.rb" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="home_controller.rb" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/controllers/home_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="29" selection-start="85" selection-end="85" vertical-scroll-proportion="0.09259259">
+ <state line="5" column="29" selection-start="85" selection-end="85" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Gemfile" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="Gemfile" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="50" selection-start="1013" selection-end="1013" vertical-scroll-proportion="0.0">
+ <state line="33" column="102" selection-start="823" selection-end="823" vertical-scroll-proportion="0.6111111">
<folding />
</state>
</provider>
@@ -143,10 +143,10 @@
<option value="$PROJECT_DIR$/app/views/home/index.html.erb" />
<option value="$PROJECT_DIR$/config/deploy/production.rb" />
<option value="$PROJECT_DIR$/config/deploy/staging.rb" />
- <option value="$PROJECT_DIR$/Gemfile" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/config/deploy.rb" />
<option value="$PROJECT_DIR$/app/controllers/home_controller.rb" />
+ <option value="$PROJECT_DIR$/Gemfile" />
</list>
</option>
</component>
@@ -747,13 +747,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Gemfile">
- <provider selected="true" editor-type-id="text-editor">
- <state line="43" column="50" selection-start="1013" selection-end="1013" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/config/database.yml">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -784,7 +777,14 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/controllers/home_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="29" selection-start="85" selection-end="85" vertical-scroll-proportion="0.09259259">
+ <state line="5" column="29" selection-start="85" selection-end="85" 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="102" selection-start="823" selection-end="823" vertical-scroll-proportion="0.6111111">
<folding />
</state>
</provider>
View
@@ -33,6 +33,8 @@ gem 'execjs'
gem 'therubyracer', :platforms => :ruby
+gem 'thin'
+
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
View
@@ -35,7 +35,9 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
+ daemons (1.1.9)
erubis (2.7.0)
+ eventmachine (0.12.10)
execjs (1.4.0)
multi_json (~> 1.0)
hashie (2.0.5)
@@ -104,6 +106,10 @@ GEM
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
+ thin (1.4.1)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.1.2)
atomic
@@ -132,5 +138,6 @@ DEPENDENCIES
sass-rails (~> 4.0.0.beta1)
sqlite3
therubyracer
+ thin
turbolinks
uglifier (>= 1.0.3)

0 comments on commit 2d09f22

Please sign in to comment.