Merge pull request #373 from skyarch-networks/dev-marketplace

Marketplace 2017.06

.gitignore

@@ -49,6 +49,9 @@ vendor/bower_components
 /frontend/node_modules/
 /frontend/typings/
 
+# MAC system files
+.DS_Store
+.idea/
 
 
 #emacs backup exclude during commit (clean files)

.rubocop.yml

@@ -99,7 +99,7 @@ Style/ConstantName:
 Style/DefWithParentheses:
   Enabled: false
 
-Style/DeprecatedHashMethods:
+Style/PreferredHashMethods:
   Enabled: false
 
 Style/Documentation:
@@ -219,7 +219,7 @@ Style/LeadingCommentSpace:
 Style/LineEndConcatenation:
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Enabled: false
 
 Style/MethodDefParentheses:

.travis.yml

@@ -23,3 +23,6 @@ before_script:
 
 script:
   - bundle exec rspec
+
+notifications:
+  slack: skyarch:RrGXgQVUmTe0r565gbHYMnmQ

Gemfile

@@ -48,7 +48,8 @@ gem "font-awesome-rails"
 
 gem 'aws-sdk-v1'
 gem 'aws-sdk', '~> 2'
-gem 'ridley', '~> 4.2.0'
+gem 'awspec', require: false
+gem 'ridley', '~> 5'
 gem "net-ssh"
 gem "net-scp"
 gem "net-http-persistent", '~> 2.9.4'
@@ -63,6 +64,7 @@ gem "sidekiq-cron", "~> 0.4.0" # for Scheduled Job
 gem 'foreman', require: false
 
 gem "introjs-rails"
+gem 'turnout' # for maintenance mode
 
 # 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"
@@ -84,7 +86,10 @@ group :development, :test do
 
   # test
   gem "rspec-rails"
-  gem "factory_girl_rails"
+
+  # Test seems to be failing because of this issue:
+  # https://github.com/thoughtbot/factory_girl/issues/981
+  gem "factory_girl_rails", "~> 4.7.0"
   gem "database_cleaner"
   gem 'guard-rspec'
   gem 'coveralls', require: false
@@ -130,8 +135,8 @@ gem 'rqrcode'
 
 gem 'sky_zabbix', '~> 2.2.0'
 
-gem 'nokogiri', '>= 1.6.8'
+gem 'nokogiri', '>= 1.7.1'
 
 gem 'rails-html-sanitizer', '~> 1.0.3'
 
-gem 'rubyzip'
+gem 'rubyzip', '>= 1.2.1'