diff --git a/Gemfile b/Gemfile index 9e0172f6..c9454d04 100644 --- a/Gemfile +++ b/Gemfile @@ -23,6 +23,7 @@ gem 'dalli' gem 'pry' gem 'metriks', '0.9.9.6' gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics' +gem 'micro_migrations' group :test do gem 'rspec', '~> 2.13' @@ -39,5 +40,4 @@ end group :development, :test do gem 'rake', '~> 0.9.2' - gem 'micro_migrations', git: 'https://gist.github.com/4269321.git' end diff --git a/Gemfile.lock b/Gemfile.lock index 49c765e0..8f2e54ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,16 +7,15 @@ GIT GIT remote: git://github.com/getsentry/raven-ruby.git - revision: 8e63d48823a60b7d591932582b6e3ee3678fea60 + revision: bd026531c390a7fbc71980871a7951bc0f2d737f specs: - sentry-raven (0.9.3) + sentry-raven (0.10.1) faraday (>= 0.7.6) - hashie (>= 1.1.0) uuidtools GIT remote: git://github.com/rack/rack-contrib.git - revision: 5c12ace4ba2b9e4802e4d948a8ee0114da18760b + revision: 1b11346d729efd88b274cd7f704e0bca9eb3de7a specs: rack-contrib (1.2.0) rack (>= 0.9.1) @@ -37,7 +36,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 89b65f97ef0ffd00dd36ba38645034c8bcc0e250 + revision: 1311a3642023e0ae19a77f4015d4c67f968420d3 branch: sf-te specs: travis-core (0.0.1) @@ -50,7 +49,7 @@ GIT metriks (~> 0.9.7) multi_json pusher (~> 0.12.0) - railties (~> 3.2.12) + railties (~> 3.2.19) rake redis (~> 3.0) rollout (~> 1.1.0) @@ -69,23 +68,17 @@ GIT GIT remote: git://github.com/travis-ci/travis-support.git - revision: 243147664e49a168b0c2d3c40c04a786bf664f37 + revision: fed35c671074eb78784a2beee3d1e5fd0dfd2620 branch: sf-te specs: travis-support (0.0.1) GIT remote: git://github.com/travis-ci/travis-yaml.git - revision: 6b10f1e5f8b32c760ac41d93ee4cc3bd714c8e5d + revision: 121678eba7280b8269a73c56953cafd20e884bdc specs: travis-yaml (0.1.0) -GIT - remote: https://gist.github.com/4269321.git - revision: 8e2d21b924a69dd48191df6a18e51769f5a88614 - specs: - micro_migrations (0.0.1) - PATH remote: . specs: @@ -105,7 +98,6 @@ PATH GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.2.8) actionmailer (3.2.19) actionpack (= 3.2.19) mail (~> 2.5.4) @@ -119,8 +111,8 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - active_model_serializers (0.8.1) - activemodel (>= 3.0) + active_model_serializers (0.9.0) + activemodel (>= 3.2) activemodel (3.2.19) activesupport (= 3.2.19) builder (~> 3.0.0) @@ -143,13 +135,25 @@ GEM backports (2.8.2) builder (3.0.4) bunny (0.8.0) - celluloid (0.12.4) - facter (>= 1.6.12) + celluloid (0.12.0) timers (>= 1.0.0) + chunky_png (1.3.1) coder (0.4.0) coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) + compass (1.0.1) + chunky_png (~> 1.2) + compass-core (~> 1.0.1) + compass-import-once (~> 1.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + sass (>= 3.3.13, < 3.5) + compass-core (1.0.1) + multi_json (~> 1.0) + sass (>= 3.3.0, < 3.5) + compass-import-once (1.0.5) + sass (>= 3.2, < 3.5) connection_pool (0.9.3) daemons (1.1.9) dalli (2.7.2) @@ -164,13 +168,11 @@ GEM equalizer (0.0.9) erubis (2.7.0) eventmachine (1.0.3) - facter (2.1.0) - CFPropertyList (~> 2.2.6) factory_girl (2.4.2) activesupport faraday (0.9.0) multipart-post (>= 1.2, < 3) - ffi (1.9.3) + ffi (1.9.5) foreman (0.64.0) dotenv (~> 0.7.0) thor (>= 0.13.6) @@ -181,12 +183,12 @@ GEM multi_json (~> 1.0) net-http-persistent (>= 2.7) net-http-pipeline - hashie (3.1.0) hashr (0.0.22) hike (1.2.3) - hitimes (1.2.1) + hitimes (1.2.2) httpclient (2.3.4.1) - i18n (0.6.5) + i18n (0.6.11) + ice_nine (0.11.0) journey (1.0.4) json (1.8.1) kgio (2.9.2) @@ -204,28 +206,29 @@ GEM atomic (~> 1.0) avl_tree (~> 1.1.2) hitimes (~> 1.1) + micro_migrations (0.0.2) + activerecord + railties mime-types (1.25.1) mocha (0.14.0) metaclass (~> 0.0.1) - multi_json (1.8.0) - multipart-post (1.2.0) - net-http-persistent (2.9) + multi_json (1.10.1) + multipart-post (2.0.0) + net-http-persistent (2.9.4) net-http-pipeline (1.0.1) pg (0.13.2) polyglot (0.3.5) proxies (0.2.1) - pry (0.10.0) + pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - puma (2.3.1) - rack (>= 1.1, < 2.0) pusher (0.12.0) httpclient (~> 2.3.0) multi_json (~> 1.0) signature (~> 0.1.6) rack (1.4.5) - rack-attack (4.1.0) + rack-attack (4.1.1) rack rack-protection (1.5.3) rack @@ -251,7 +254,7 @@ GEM json (~> 1.4) redcarpet (2.3.0) redis (3.1.0) - redis-namespace (1.5.0) + redis-namespace (1.5.1) redis (~> 3.0, >= 3.0.4) rerun (0.8.2) listen (~> 1.0.3) @@ -260,18 +263,22 @@ GEM rspec-core (~> 2.99.0) rspec-expectations (~> 2.99.0) rspec-mocks (~> 2.99.0) - rspec-core (2.99.1) - rspec-expectations (2.99.1) + rspec-core (2.99.2) + rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.99.1) + rspec-mocks (2.99.2) s3 (0.3.21) proxies (~> 0.2.0) - sidekiq (2.5.4) + sass (3.4.5) + sidekiq (2.5.0) celluloid (~> 0.12.0) + compass connection_pool (~> 0.9.2) multi_json (~> 1) redis (~> 3) redis-namespace + sass + sprockets-sass signature (0.1.7) simple_states (1.0.1) activesupport @@ -287,20 +294,23 @@ GEM rack-test sinatra (~> 1.4.0) tilt (~> 1.3) - slop (3.5.0) + slop (3.6.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thin (1.6.2) - daemons (>= 1.0.9) - eventmachine (>= 1.0.0) - rack (>= 1.0.0) + sprockets-sass (1.2.0) + sprockets (~> 2.0) + tilt (~> 1.1) + thin (1.6.3) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0) + rack (~> 1.0) thor (0.14.6) thread_safe (0.3.4) tilt (1.4.1) - timers (3.0.1) + timers (4.0.1) hitimes treetop (1.4.15) polyglot @@ -310,7 +320,7 @@ GEM kgio (~> 2.6) rack raindrops (~> 0.7) - uuidtools (2.1.4) + uuidtools (2.1.5) virtus (1.0.3) axiom-types (~> 0.1) coercible (~> 1.0) @@ -331,7 +341,7 @@ DEPENDENCIES gh metriks (= 0.9.9.6) metriks-librato_metrics! - micro_migrations! + micro_migrations mocha (~> 0.12) pry rack-attack