summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Bernlöhr <Heiko.Bernloehr@FreeIT.de>2018-01-12 09:48:35 +0100
committerHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2018-01-12 11:53:15 +0100
commit5d7dbda7a475fdbf0c091dc308384a32333b00e4 (patch)
treef25212d489e4d0eefee8da5e16775e470bcf2039
parent88c277596e7ec4f88217158f079c5688374f71cb (diff)
downloadecs-5d7dbda7a475fdbf0c091dc308384a32333b00e4.tar.gz
ecs-5d7dbda7a475fdbf0c091dc308384a32333b00e4.zip
Add unicorn gem.
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock62
2 files changed, 39 insertions, 26 deletions
diff --git a/Gemfile b/Gemfile
index fb39a79..b5a40ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ gem 'spring', group: :development
# gem 'bcrypt', '~> 3.1.7'
# Use unicorn as the app server
-# gem 'unicorn'
+gem 'unicorn'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
@@ -41,3 +41,4 @@ gem 'spring', group: :development
gem "pg"
gem "haml", "4.0.5"
gem "simple-navigation"
+gem 'unicorn-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2ced1e2..5f82e56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,29 +32,32 @@ GEM
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
- coffee-script (2.2.0)
+ coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.12.2)
+ concurrent-ruby (1.0.5)
erubis (2.7.0)
- execjs (2.2.1)
+ execjs (2.7.0)
haml (4.0.5)
tilt
hike (1.2.3)
- i18n (0.8.6)
- jbuilder (2.1.3)
- activesupport (>= 3.0.0, < 5)
- multi_json (~> 1.2)
- jquery-rails (3.1.2)
+ i18n (0.9.1)
+ concurrent-ruby (~> 1.0)
+ jbuilder (2.6.4)
+ activesupport (>= 3.0.0)
+ multi_json (>= 1.2)
+ jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
+ kgio (2.11.1)
libv8 (3.16.14.19)
- mail (2.6.1)
- mime-types (>= 1.16, < 3)
- mime-types (1.25)
- minitest (5.10.3)
- multi_json (1.12.2)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
+ mini_mime (1.0.0)
+ minitest (5.11.1)
+ multi_json (1.13.1)
pg (1.0.0)
rack (1.5.5)
rack-test (0.6.3)
@@ -74,8 +77,9 @@ GEM
activesupport (= 4.1.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (12.1.0)
- rdoc (4.1.0)
+ raindrops (0.19.0)
+ rake (12.3.0)
+ rdoc (4.3.0)
ref (2.0.0)
sass (3.2.19)
sass-rails (4.0.5)
@@ -83,12 +87,12 @@ GEM
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
- sdoc (0.4.1)
+ sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
- simple-navigation (4.0.4)
+ simple-navigation (4.0.5)
activesupport (>= 2.3.2)
- spring (1.1.3)
+ spring (1.7.2)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -98,20 +102,26 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
- sqlite3 (1.3.9)
+ sqlite3 (1.3.13)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.20.0)
thread_safe (0.3.6)
tilt (1.4.1)
- turbolinks (2.2.2)
- coffee-rails
- tzinfo (1.2.3)
+ turbolinks (5.1.0)
+ turbolinks-source (~> 5.1)
+ turbolinks-source (5.1.0)
+ tzinfo (1.2.4)
thread_safe (~> 0.1)
- uglifier (2.5.3)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
+ uglifier (4.1.3)
+ execjs (>= 0.3.0, < 3)
+ unicorn (5.4.0)
+ kgio (~> 2.6)
+ raindrops (~> 0.7)
+ unicorn-rails (2.2.1)
+ rack
+ unicorn
PLATFORMS
ruby
@@ -131,6 +141,8 @@ DEPENDENCIES
therubyracer
turbolinks
uglifier (>= 1.3.0)
+ unicorn
+ unicorn-rails
BUNDLED WITH
1.15.4