summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-07 12:46:17 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-07 12:46:17 +0100
commitf1e92e936afcde88e79e1169a5c1ea91f66b5e16 (patch)
treea0c5723b8b7c2545f4ee8722f0dd9348d82f5ef3
parentb66cf13cab7bbef0ae4244aabc023fede67e36fb (diff)
parent319b4adeb16b65618983a6268b21ea21efafed78 (diff)
Merge branch 'gem_stuff' into develop
-rw-r--r--Gemfile8
-rw-r--r--Gemfile.lock20
2 files changed, 6 insertions, 22 deletions
diff --git a/Gemfile b/Gemfile
index 163c360..3cf01bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,12 +25,7 @@ group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'compass-rails'
-
- # See https://github.com/sstephenson/execjs#readme for more supported runtimes
- gem 'therubyracer'
-
- gem 'uglifier', '>= 1.0.3'
-
+ gem 'uglifier', '>= 1.3.0'
end
gem 'json'
@@ -40,7 +35,6 @@ gem 'jquery-rails'
group :development do
gem 'factory_girl_rails'
gem 'factory_girl'
- gem "rails-erd", "~> 0.4.5"
end
group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 64efe4b..df12c39 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,7 +67,7 @@ GEM
eventmachine
erubis (2.7.0)
eventmachine (1.0.0.beta.4)
- execjs (1.3.0)
+ execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (2.6.4)
activesupport (>= 2.3.9)
@@ -95,7 +95,6 @@ GEM
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.6.5)
- libv8 (3.3.10.4)
macaddr (1.6.1)
systemu (~> 2.5.0)
mail (2.4.3)
@@ -105,7 +104,7 @@ GEM
mime-types (1.17.2)
mini_magick (3.4)
subexec (~> 0.2.1)
- multi_json (1.1.0)
+ multi_json (1.5.0)
mysql2 (0.3.11)
nokogiri (1.5.5)
polyglot (0.3.3)
@@ -126,10 +125,6 @@ GEM
activesupport (= 3.2.2)
bundler (~> 1.0)
railties (= 3.2.2)
- rails-erd (0.4.5)
- activerecord (~> 3.0)
- activesupport (~> 3.0)
- ruby-graphviz (~> 0.9.18)
railties (3.2.2)
actionpack (= 3.2.2)
activesupport (= 3.2.2)
@@ -140,7 +135,6 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- ruby-graphviz (0.9.21)
sass (3.1.15)
sass-rails (3.2.4)
railties (~> 3.2.0)
@@ -157,17 +151,15 @@ GEM
state_machine (1.1.2)
subexec (0.2.1)
systemu (2.5.1)
- therubyracer (0.9.10)
- libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.32)
- uglifier (1.2.3)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
+ multi_json (~> 1.0, >= 1.0.2)
uuid (2.3.5)
macaddr (~> 1.0)
will_paginate (3.0.3)
@@ -198,12 +190,10 @@ DEPENDENCIES
nokogiri
private_pub
rails (= 3.2.2)
- rails-erd (~> 0.4.5)
sass-rails (~> 3.2.3)
simple_form (= 2.0.1)
sqlite3
state_machine
- therubyracer
- uglifier (>= 1.0.3)
+ uglifier (>= 1.3.0)
uuid
will_paginate