From 08ef298b842f4e48fd254b3c931977ae7f109993 Mon Sep 17 00:00:00 2001 From: Brian DeHamer Date: Mon, 23 Feb 2015 12:43:31 -0800 Subject: [PATCH] Sync gems with latest panamax requirements --- Gemfile | 14 ++++----- Gemfile.lock | 83 +++++++++++++++++++++++++++++----------------------- 2 files changed, 53 insertions(+), 44 deletions(-) diff --git a/Gemfile b/Gemfile index 1af67ba..f66c195 100644 --- a/Gemfile +++ b/Gemfile @@ -7,31 +7,31 @@ gem 'faraday', '0.8.9' gem 'activeresource', '4.0.0' # UI Gems -gem 'jquery-rails', '3.1.1' -gem 'jquery-ui-rails', '4.2.1' +gem 'ctl_base_ui', '0.0.5' gem 'sass', '3.3.9' gem 'therubyracer', '0.12.1', platforms: :ruby gem 'haml', '4.0.5' gem 'uglifier', '2.5.1' gem 'kramdown', '1.4.0' +gem 'zeroclipboard-rails', '0.1.0' # API Gems gem 'sqlite3', '1.3.9' gem 'faraday_middleware', '0.9.0' gem 'docker-api', '1.13.0' -gem 'fleet-api', '0.6.0' +gem 'fleet-api', '1.1.0' gem 'active_model_serializers', '0.9.0' gem 'octokit', '3.2.0' gem 'kmts', '2.0.1' group :development do - gem 'rspec-rails', '2.14.2' - gem 'capybara', '2.3.0' + gem 'rspec-rails', '3.1.0' + gem 'its', '0.2.0' + gem 'capybara', '2.4.4' gem 'teaspoon', '0.8.0' gem 'phantomjs', '1.9.7.1' gem 'dotenv-rails', '0.11.1' - gem 'jshintrb', '0.2.4' - gem 'webmock', '1.18.0' + gem 'webmock', '1.20.4' gem 'sinatra', '1.4.5' gem 'coveralls', '0.7.0' gem 'shoulda-matchers', '2.6.1' diff --git a/Gemfile.lock b/Gemfile.lock index c249bf3..f6ad213 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM archive-tar-minitar (0.5.2) arel (5.0.1.20140414130214) builder (3.2.2) - capybara (2.3.0) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -51,6 +51,12 @@ GEM thor crack (0.4.2) safe_yaml (~> 1.0.0) + ctl_base_ui (0.0.5) + haml (~> 4.0) + jquery-rails (~> 3.1) + jquery-ui-rails (~> 4.2) + rails (~> 4.1) + sass (~> 3.3) database_cleaner (1.3.0) diff-lcs (1.2.5) docile (1.1.5) @@ -65,40 +71,37 @@ GEM dotenv (= 0.11.1) erubis (2.7.0) excon (0.37.0) - execjs (2.2.1) + execjs (2.2.2) faraday (0.8.9) multipart-post (~> 1.2.0) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) - fleet-api (0.6.0) - faraday (= 0.8.9) - faraday_middleware (= 0.9.0) + fleet-api (1.1.0) + excon (>= 0.27.4) haml (4.0.5) tilt hike (1.2.3) - i18n (0.6.11) - jquery-rails (3.1.1) + i18n (0.7.0) + its (0.2.0) + rspec-core + jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - jshintrb (0.2.4) - execjs - multi_json (>= 1.3) - rake - json (1.8.1) + json (1.8.2) kmts (2.0.1) kramdown (1.4.0) libv8 (3.16.14.7) mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) - mini_portile (0.6.0) - minitest (5.4.2) + mini_portile (0.6.2) + minitest (5.5.1) multi_json (1.10.1) multipart-post (1.2.0) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) octokit (3.2.0) sawyer (~> 0.5.3) phantomjs (1.9.7.1) @@ -107,7 +110,7 @@ GEM rack (1.5.2) rack-protection (1.5.3) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.7) actionmailer (= 4.1.7) @@ -126,23 +129,27 @@ GEM activesupport (= 4.1.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.2) + rake (10.4.0) ref (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) + rspec-core (3.1.7) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.3) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) actionpack (>= 3.0) - activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - safe_yaml (1.0.3) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.2) + safe_yaml (1.0.4) sass (3.3.9) sawyer (0.5.4) addressable (~> 2.3.5) @@ -163,7 +170,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.0) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -184,11 +191,13 @@ GEM uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) - webmock (1.18.0) + webmock (1.20.4) addressable (>= 2.3.6) crack (>= 0.3.2) xpath (2.0.0) nokogiri (~> 1.3) + zeroclipboard-rails (0.1.0) + railties (>= 3.1) PLATFORMS ruby @@ -196,25 +205,24 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.0) activeresource (= 4.0.0) - capybara (= 2.3.0) + capybara (= 2.4.4) coveralls (= 0.7.0) + ctl_base_ui (= 0.0.5) database_cleaner (= 1.3.0) docker-api (= 1.13.0) dotenv-rails (= 0.11.1) faraday (= 0.8.9) faraday_middleware (= 0.9.0) - fleet-api (= 0.6.0) + fleet-api (= 1.1.0) haml (= 4.0.5) - jquery-rails (= 3.1.1) - jquery-ui-rails (= 4.2.1) - jshintrb (= 0.2.4) + its (= 0.2.0) kmts (= 2.0.1) kramdown (= 1.4.0) octokit (= 3.2.0) phantomjs (= 1.9.7.1) puma (= 2.8.2) rails (= 4.1.7) - rspec-rails (= 2.14.2) + rspec-rails (= 3.1.0) sass (= 3.3.9) shoulda-matchers (= 2.6.1) sinatra (= 1.4.5) @@ -222,4 +230,5 @@ DEPENDENCIES teaspoon (= 0.8.0) therubyracer (= 0.12.1) uglifier (= 2.5.1) - webmock (= 1.18.0) + webmock (= 1.20.4) + zeroclipboard-rails (= 0.1.0)