Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependency Problems fix #339

Merged
merged 4 commits into from Oct 13, 2016
Merged

Dependency Problems fix #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ca615b
Removed unused dependencies and downgrade net-http-persistent as it i…
Joeper214 Oct 13, 2016
58eb510
net-http-presistent gem
Joeper214 Oct 13, 2016
d5b5a11
Redis 3 or higher installation script from remi repository installati…
Joeper214 Oct 13, 2016
f5d5431
uddate english readme.
Joeper214 Oct 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Expand Up @@ -47,6 +47,7 @@ gem 'aws-sdk', '~> 2'
gem 'ridley', '~> 4.2.0'
gem "net-ssh"
gem "net-scp"
gem "net-http-persistent", '~> 2.9.4'

gem "knife-windows"
gem "chef", "~> 12", require: false
Expand All @@ -57,7 +58,6 @@ gem 'sidekiq' # for Active Job
gem "sidekiq-cron", "~> 0.4.0" # for Scheduled Job
gem 'foreman', require: false

gem "bootstrap-table-rails"

# Temporarily set ruby_dep version to 1.3.1 because it requires ruby 2.2.5 that is not yet available on amazon linux
gem "ruby_dep", "~> 1.3.1"
Expand Down
8 changes: 3 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -62,7 +62,6 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-table-rails (1.11.0)
browserify-rails (3.2.0)
addressable (>= 2.4.0)
railties (>= 4.0.0, < 5.1)
Expand Down Expand Up @@ -249,8 +248,7 @@ GEM
named_let (0.2.0)
rspec-core
nenv (0.3.0)
net-http-persistent (3.0.0)
connection_pool (~> 2.2)
net-http-persistent (2.9.4)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
Expand Down Expand Up @@ -550,7 +548,6 @@ DEPENDENCIES
aws-sdk-v1
better_errors
binding_of_caller
bootstrap-table-rails
browserify-rails
bullet
chef (~> 12)
Expand All @@ -574,6 +571,7 @@ DEPENDENCIES
libv8
mysql2 (~> 0.3.20)
named_let
net-http-persistent (~> 2.9.4)
net-scp
net-ssh
nokogiri (>= 1.6.8)
Expand Down Expand Up @@ -620,4 +618,4 @@ DEPENDENCIES
yard

BUNDLED WITH
1.13.1
1.13.3
3 changes: 2 additions & 1 deletion doc/installation/en/skyhopper.md
View file
Open in desktop
Expand Up @@ -48,7 +48,8 @@ $ sudo npm install bower --global
```sh
$ sudo yum groupinstall 'Development tools' 'Development Libraries'
$ sudo yum install ruby22-devel sqlite-devel zlib-devel readline-devel openssl-devel libxml2-devel libxslt-devel mysql-devel mysql-server nginx
$ sudo yum --enablerepo=epel install redis
$ sudo rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
$ sudo yum --enablerepo=remi,remi-test install redis
```


Expand Down
3 changes: 2 additions & 1 deletion doc/installation/skyhopper.md
View file
Open in desktop
Expand Up @@ -49,7 +49,8 @@ $ sudo npm install bower --global
```sh
$ sudo yum groupinstall 'Development tools' 'Development Libraries'
$ sudo yum install ruby22-devel sqlite-devel zlib-devel readline-devel openssl-devel libxml2-devel libxslt-devel mysql-devel mysql-server nginx
$ sudo yum --enablerepo=epel install redis
$ sudo rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
$ sudo yum --enablerepo=remi,remi-test install redis
```


Expand Down