diff --git a/Gemfile b/Gemfile index 6c464623b2b890b3651e0bc8ffd671580f2d7eb1..c02c7013debead86a70a77f835c37586c0c256f2 100644 --- a/Gemfile +++ b/Gemfile @@ -226,7 +226,7 @@ group :production do # we don"t install these on travis to speed up test runs # Process management - gem "eye", "0.9.2" + gem "eye", "0.10.0" # Redirects diff --git a/Gemfile.lock b/Gemfile.lock index c4f45b170a419f917f3578ee9d50f7103efd3e84..5cce823f3fd0a15b743db3f2f6973d76905bd84f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,10 +199,10 @@ GEM ffi (>= 1.3.0) excon (0.62.0) execjs (2.7.0) - eye (0.9.2) + eye (0.10.0) celluloid (~> 0.17.3) celluloid-io (~> 0.17.0) - sigar (~> 0.7.3) + kostya-sigar (~> 2.0.0) state_machines thor fabrication (2.20.1) @@ -349,6 +349,7 @@ GEM multi_json jwt (1.5.6) kgio (2.11.2) + kostya-sigar (2.0.0) leaflet-rails (1.3.1) rails (>= 4.2.0) listen (3.1.5) @@ -653,7 +654,6 @@ GEM sidekiq-cron (0.6.3) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sigar (0.7.3) simple_captcha2 (0.4.3) rails (>= 4.1) simple_oauth (0.3.1) @@ -788,7 +788,7 @@ DEPENDENCIES diaspora_federation-rails (= 0.2.4) diaspora_federation-test (= 0.2.4) entypo-rails (= 3.0.0) - eye (= 0.9.2) + eye (= 0.10.0) factory_girl_rails (= 4.8.0) faraday (= 0.12.2) faraday-cookie_jar (= 0.0.6) diff --git a/script/configure_bundler b/script/configure_bundler index 1f30cca70031643d9aa027eaa7a242d1a8c78e3e..67e6aa055fc22164ca5053fe9b195b7adeb6aa3e 100755 --- a/script/configure_bundler +++ b/script/configure_bundler @@ -28,8 +28,4 @@ if rails_env != "development" config("disable_shared_gems true") end -if `gcc -dumpversion`.split(".").first.to_i >= 5 - config("build.sigar \"--with-cppflags='-fgnu89-inline'\"") -end - puts "Bundler configured! Please run 'bin/bundle install' now."