t#29860:fix;oplg test broken

[pettanr/pettanr.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index ed34277..b7a1755 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
       mime-types
       xml-simple
     bcrypt-ruby (3.0.1-x86-mingw32)
-    builder (3.0.0)
+    builder (3.0.3)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -57,8 +57,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    creative_commons_v30_licenses (0.0.9)
-      rails (~> 3.1.1)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -77,14 +75,14 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.0.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
     ffi (1.1.5-x86-mingw32)
-    gherkin (2.11.2-x86-mingw32)
+    gherkin (2.11.4-x86-mingw32)
       json (>= 1.4.6)
     hike (1.2.1)
-    i18n (0.6.0)
-    jquery-rails (2.1.1)
+    i18n (0.6.1)
+    jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
@@ -99,16 +97,20 @@ GEM
     multi_json (1.3.6)
     nokogiri (1.5.5-x86-mingw32)
     orm_adapter (0.0.7)
-    pettan_commons_v01_licenses (0.0.6)
+    pettanr_creative_commons_v30_licenses (0.0.2)
       rails (~> 3.1.1)
-    pettan_protected_v01_licenses (0.0.6)
+    pettanr_pettan_commons_v01_licenses (0.0.3)
       rails (~> 3.1.1)
-    pettan_public_v01_licenses (0.0.6)
+    pettanr_pettan_protected_v01_licenses (0.0.3)
       rails (~> 3.1.1)
-    pg (0.14.0-x86-mingw32)
-    polyglot (0.3.3)
-    public_domain_v01_licenses (0.0.6)
+    pettanr_pettan_public_v01_licenses (0.0.3)
+      rails (~> 3.1.1)
+    pettanr_public_domain_v01_licenses (0.0.2)
+      rails (~> 3.1.1)
+    pettanr_unknown_v01_licenses (0.0.3)
       rails (~> 3.1.1)
+    pg (0.14.1-x86-mingw32)
+    polyglot (0.3.3)
     rack (1.3.6)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -116,7 +118,7 @@ GEM
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.1.1)
       actionmailer (= 3.1.1)
@@ -147,9 +149,9 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.11.3)
     rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -173,20 +175,16 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6-x86-mingw32)
-    standard_licenses (0.0.6)
-      rails (~> 3.1.1)
     therubyracer-heroku (0.8.1.pre3)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    uglifier (1.2.7)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-    unknown_v01_licenses (0.0.6)
-      rails (~> 3.1.1)
+      multi_json (~> 1.0, >= 1.0.2)
     validate_url (0.2.0)
       activemodel (>= 3.0.0)
     validates_existence (0.7.1)
@@ -207,7 +205,6 @@ DEPENDENCIES
   autotest
   aws-s3
   coffee-rails (~> 3.1.1)
-  creative_commons_v30_licenses
   cucumber
   cucumber-rails
   database_cleaner
@@ -215,11 +212,13 @@ DEPENDENCIES
   factory_girl
   jquery-rails
   moro-miso
-  pettan_commons_v01_licenses
-  pettan_protected_v01_licenses
-  pettan_public_v01_licenses
+  pettanr_creative_commons_v30_licenses
+  pettanr_pettan_commons_v01_licenses
+  pettanr_pettan_protected_v01_licenses
+  pettanr_pettan_public_v01_licenses
+  pettanr_public_domain_v01_licenses
+  pettanr_unknown_v01_licenses
   pg
-  public_domain_v01_licenses
   rails (= 3.1.1)
   rails-erd
   rmagick
@@ -227,10 +226,8 @@ DEPENDENCIES
   rspec-rails
   sass-rails (~> 3.1.4)
   sqlite3
-  standard_licenses
   therubyracer-heroku
   uglifier (>= 1.0.3)
-  unknown_v01_licenses
   validate_url
   validates_existence
   webrat