From 55fbae009c7ef7293d815aa309bdc1fdd5da79a0 Mon Sep 17 00:00:00 2001 From: "Rico Sta. Cruz" Date: Wed, 2 Dec 2015 21:13:08 +0800 Subject: [PATCH 1/5] Fix gemspec --- active_admin_editor.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/active_admin_editor.gemspec b/active_admin_editor.gemspec index 0e2bbee..3129482 100644 --- a/active_admin_editor.gemspec +++ b/active_admin_editor.gemspec @@ -26,7 +26,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'factory_girl_rails' s.add_development_dependency 'database_cleaner', '~> 0.9.1' s.add_development_dependency 'capybara', '~> 1.1.4' - s.add_development_dependency 'activeadmin', '~> 0.4.3' s.add_development_dependency 'poltergeist', '~> 1.0.2' s.add_development_dependency 'faker' From ac4d7f1484031b156a441e6b310eafa2712efb78 Mon Sep 17 00:00:00 2001 From: "Rico Sta. Cruz" Date: Wed, 2 Dec 2015 21:20:39 +0800 Subject: [PATCH 2/5] Gemfile: fix HTTPS warnings --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7b35b13..2b36605 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source :rubygems +source 'https://rubygems.org' # Declare your gem's dependencies in active_admin_editor.gemspec. # Bundler will treat runtime dependencies like base dependencies, and From 4dd83374f92b7304528c7b2ef49de03a895405bc Mon Sep 17 00:00:00 2001 From: "Rico Sta. Cruz" Date: Wed, 2 Dec 2015 21:22:05 +0800 Subject: [PATCH 3/5] Gemfile: remove duplicate gems --- Gemfile | 16 ++-------------- Gemfile.lock | 6 ++++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 2b36605..96936b4 100644 --- a/Gemfile +++ b/Gemfile @@ -9,23 +9,11 @@ gem 'meta_search' gem 'sass-rails' gem 'coffee-rails' gem 'uglifier' -gem 'activeadmin' -gem 'konacha' # jquery-rails is used by the dummy application gem 'jquery-rails' +gem 'ejs' +gem 'konacha' gem 'chai-jquery-rails' gem 'sinon-chai-rails' gem 'sinon-rails' -gem 'ejs' - -group :development, :test do -end - -# Declare any dependencies that are still in development here instead of in -# your gemspec. These might include edge Rails or gems from your path or -# Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. - -# To use debugger -# gem 'ruby-debug19', :require => 'ruby-debug' diff --git a/Gemfile.lock b/Gemfile.lock index 4d5d446..616d59d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ PATH rails (>= 3.0.0) GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: actionmailer (3.2.9) actionpack (= 3.2.9) @@ -227,7 +227,6 @@ PLATFORMS DEPENDENCIES active_admin_editor! - activeadmin capybara (~> 1.1.4) chai-jquery-rails coffee-rails @@ -246,3 +245,6 @@ DEPENDENCIES sinon-rails sqlite3 uglifier + +BUNDLED WITH + 1.10.6 From e3a2ff741b48812ccddab261fbdfd19d8be04000 Mon Sep 17 00:00:00 2001 From: "Rico Sta. Cruz" Date: Thu, 3 Dec 2015 18:50:55 +0800 Subject: [PATCH 4/5] Update to new travis infrastructure --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7ba590f..58b8791 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: ruby rvm: - 1.9.2 From 4ebacae2dfe12d4b32680b59f3eaae9970bb0562 Mon Sep 17 00:00:00 2001 From: "Rico Sta. Cruz" Date: Thu, 3 Dec 2015 19:28:06 +0800 Subject: [PATCH 5/5] Update selenium-webdriver --- Gemfile.lock | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 616d59d..498f08f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,8 +132,10 @@ GEM activesupport (~> 3.1) polyamorous (~> 0.5.0) mime-types (1.19) + mini_portile2 (2.0.0) multi_json (1.7.7) - nokogiri (1.5.6) + nokogiri (1.6.7) + mini_portile2 (~> 2.0.0.rc2) orm_adapter (0.4.0) poltergeist (1.0.2) capybara (~> 1.1) @@ -186,16 +188,16 @@ GEM rspec-core (~> 2.12.0) rspec-expectations (~> 2.12.0) rspec-mocks (~> 2.12.0) - rubyzip (0.9.9) + rubyzip (1.1.7) sass (3.2.4) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.33.0) + selenium-webdriver (2.39.0) childprocess (>= 0.2.5) multi_json (~> 1.0) - rubyzip + rubyzip (~> 1.0) websocket (~> 1.0.4) sinon-chai-rails (1.0.2) railties (>= 3.1)