Skip to content

Commit

Permalink
bundle installed
Browse files Browse the repository at this point in the history
  • Loading branch information
kisonecat committed Feb 8, 2016
1 parent ce2d93c commit 11c3737
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ group :test do
end

group :staging, :production do
gem 'libv8'
# gem 'libv8'
gem 'piwik_analytics', '~> 1.0.1'
end

group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'

gem 'therubyracer'
# gem 'therubyracer'

gem 'uglifier', '>= 1.0.3'
gem 'turbo-sprockets-rails3'
Expand Down
21 changes: 9 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GEM
arel (3.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.4)
capistrano (2.14.1)
capistrano (2.15.7)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
Expand Down Expand Up @@ -66,7 +66,7 @@ GEM
gibberish (1.2.2)
gravatar_image_tag (1.1.3)
hashie (1.2.0)
highline (1.6.15)
highline (1.7.8)
hike (1.2.1)
httpauth (0.2.0)
i18n (0.6.1)
Expand All @@ -82,7 +82,6 @@ GEM
less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
libv8 (3.11.8.12)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
Expand All @@ -93,11 +92,11 @@ GEM
multi_json (1.6.0)
multipart-post (1.1.5)
mysql2 (0.3.11)
net-scp (1.1.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.1)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.5)
net-ssh (3.0.2)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.5.6)
Expand Down Expand Up @@ -156,7 +155,6 @@ GEM
rake (10.0.3)
rdoc (3.12.1)
json (~> 1.4)
ref (1.0.2)
ruby-openid (2.2.3)
rvm-capistrano (1.2.7)
capistrano (>= 2.0.0)
Expand All @@ -171,8 +169,6 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
therubyracer (0.11.3)
ref
thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
Expand Down Expand Up @@ -203,15 +199,14 @@ PLATFORMS

DEPENDENCIES
ambry
capistrano
capistrano (~> 2.15.5)
coffee-rails (~> 3.2.1)
devise
factory_girl_rails
gravatar_image_tag
jquery-rails
json
less-rails
libv8
merit
mysql2
nokogiri
Expand All @@ -224,9 +219,11 @@ DEPENDENCIES
rvm-capistrano
sass-rails (~> 3.2.3)
sqlite3
therubyracer
thin
tokenifier (~> 0.1)
turbo-sprockets-rails3
twitter-bootstrap-rails
uglifier (>= 1.0.3)

BUNDLED WITH
1.10.6

0 comments on commit 11c3737

Please sign in to comment.