diff options
| author | Peter Kozak <spag@golwen.net> | 2013-09-06 09:36:54 +0200 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-09-06 09:36:54 +0200 |
| commit | 6c3a4407649487e52b7919c86f9f01f322a4e231 (patch) | |
| tree | 7fe08e7be5bfce7405c7256ee2e6ff5ed13ce5e5 | |
| parent | cab241be042a53ade4e20a2a5abf78516fed6289 (diff) | |
| parent | 1969256907890a32e5cf11a210d2a5db1a2f0e53 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 10 insertions, 0 deletions
@@ -48,6 +48,8 @@ group :development do # Debugging http://railscasts.com/episodes/402-better-errors-railspanel gem 'better_errors' gem 'binding_of_caller' + + gem 'rails-erd' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 010c3d1..902e551 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,7 @@ GEM carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) + choice (0.1.6) chronic (0.9.1) chunky_png (1.2.7) coderay (1.0.9) @@ -150,6 +151,11 @@ GEM activesupport (= 3.2.13) bundler (~> 1.0) railties (= 3.2.13) + rails-erd (1.1.0) + activerecord (>= 3.0) + activesupport (>= 3.0) + choice (~> 0.1.6) + ruby-graphviz (~> 1.0.4) railties (3.2.13) actionpack (= 3.2.13) activesupport (= 3.2.13) @@ -161,6 +167,7 @@ GEM rake (10.0.3) rdoc (3.12.2) json (~> 1.4) + ruby-graphviz (1.0.9) sass (3.2.7) sass-rails (3.2.6) railties (~> 3.2.0) @@ -246,6 +253,7 @@ DEPENDENCIES private_pub quiet_assets rails (= 3.2.13) + rails-erd sass-rails sextant simple_form (~> 2.1.0) |