Commit 4bde0017 authored by Jonne Haß's avatar Jonne Haß Committed by Dennis Schubert
Browse files

replace foreman with eye 

closes #5966
parent a21de8b1

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
* Do not retry a couple of unrecoverable job failures [#5938](https://github.com/diaspora/diaspora/pull/5938) [#5942](https://github.com/diaspora/diaspora/pull/5943)

* Remove some old temporary workarounds [#5964](https://github.com/diaspora/diaspora/pull/5964)

* Remove unused `hasPhotos` and `hasText` functions [#5969](https://github.com/diaspora/diaspora/pull/5969)

* Replace foreman with eye [#5966](https://github.com/diaspora/diaspora/pull/5966)



## Bug fixes

* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ group :production do # we don"t install these on travis to speed up test runs 


  # Process management



  gem "foreman", "0.62"

  gem "eye", "0.7.pre"



  # Redirects

Gemfile.lock

+13 −3
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ GEM 
      mime-types (>= 1.16)

    celluloid (0.16.0)

      timers (~> 4.0.0)

    celluloid-io (0.16.2)

      celluloid (>= 0.16.0)

      nio4r (>= 1.1.0)

    childprocess (0.5.6)

      ffi (~> 1.0, >= 1.0.11)

    chunky_png (1.3.4)
@@ -173,6 +176,12 @@ GEM 
    eventmachine (1.0.7)

    excon (0.45.3)

    execjs (2.5.2)

    eye (0.7.pre)

      celluloid (~> 0.16.0)

      celluloid-io (~> 0.16.0)

      sigar (~> 0.7.2)

      state_machine

      thor

    factory_girl (4.5.0)

      activesupport (>= 3.0.0)

    factory_girl_rails (4.5.0)
@@ -287,8 +296,6 @@ GEM 
      nokogiri (~> 1.5, >= 1.5.11)

    font-awesome-rails (4.3.0.0)

      railties (>= 3.2, < 5.0)

    foreman (0.62.0)

      thor (>= 0.13.6)

    formatador (0.2.5)

    fuubar (2.0.0)

      rspec (~> 3.0)
@@ -411,6 +418,7 @@ GEM 
    net-scp (1.2.1)

      net-ssh (>= 2.6.5)

    net-ssh (2.9.2)

    nio4r (1.1.0)

    nokogiri (1.6.6.2)

      mini_portile (~> 0.6.0)

    notiffany (0.0.6)
@@ -636,6 +644,7 @@ GEM 
      celluloid (>= 0.14.1)

      ice_cube (= 0.11.1)

      sidekiq (>= 3.0.0)

    sigar (0.7.3)

    simple_captcha2 (0.3.4)

      rails (>= 4.1)

    simple_oauth (0.2.0)
@@ -660,6 +669,7 @@ GEM 
      actionpack (>= 3.0)

      activesupport (>= 3.0)

      sprockets (>= 2.8, < 4.0)

    state_machine (1.2.0)

    systemu (2.6.5)

    test_after_commit (0.4.1)

      activerecord (>= 3.2)
@@ -729,13 +739,13 @@ DEPENDENCIES 
  devise_lastseenable (= 0.0.4)

  diaspora-vines (~> 0.1.27)

  entypo-rails (= 2.2.3)

  eye (= 0.7.pre)

  factory_girl_rails (= 4.5.0)

  faraday (= 0.9.1)

  faraday-cookie_jar (= 0.0.6)

  faraday_middleware (= 0.9.1)

  fixture_builder (= 0.3.6)

  fog (= 1.30.0)

  foreman (= 0.62)

  fuubar (= 2.0.0)

  gon (= 5.2.3)

  guard (= 2.12.5)

Procfile

+1 −2
Original line number Diff line number Diff line 
web: bin/bundle exec unicorn_rails -c config/unicorn.rb -p $PORT

web: bin/bundle exec unicorn -c config/unicorn.rb -p $PORT

sidekiq: bin/bundle exec sidekiq
 
xmpp: bin/bundle exec vines start

bin/eye

0 → 100755
+16 −0
Original line number Diff line number Diff line 
#!/usr/bin/env ruby

#

# This file was generated by Bundler.

#

# The application 'eye' is installed as part of a gem, and

# this file is here to facilitate running it.

#



require 'pathname'

ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",

  Pathname.new(__FILE__).realpath)



require 'rubygems'

require 'bundler/setup'



load Gem.bin_path('eye', 'eye')