Merge branch 'master' into fix_nested_objs

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto
+
+spec/fixtures/vcr_cassettes/**/* -diff

.github/workflows/rubocop.yml

@@ -0,0 +1,2 @@
+- name: Rubocop checks
+  uses: gimenete/[email protected]

.travis.yml

@@ -8,10 +8,6 @@ services:
   - docker
   - memcached
 
-addons:
-  code_climate:
-    repo_token: $CODECLIMATE_REPO_TOKEN
-
 before_install:
   - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.1.1-amd64.deb
   - sudo dpkg -i --force-confnew elasticsearch-7.1.1-amd64.deb

Dockerfile

@@ -30,14 +30,27 @@ COPY vendor/docker/00_app_env.conf /etc/nginx/conf.d/00_app_env.conf
 # Use Amazon NTP servers
 COPY vendor/docker/ntp.conf /etc/ntp.conf
 
+# Add Runit script for shoryuken workers
+WORKDIR /home/app/webapp
+RUN mkdir /etc/service/shoryuken
+COPY vendor/docker/shoryuken.sh /etc/service/shoryuken/run
+
+# Install Passenger monitor for Datadog
+# RUN wget https://github.com/Sjeanpierre/passenger-datadog-monitor/releases/download/v1.00/passenger-datadog-monitor && \
+#     mv passenger-datadog-monitor /usr/local/bin && \
+#     chmod +x /usr/local/bin/passenger-datadog-monitor && \
+#     mkdir /etc/service/passenger-datadog
+# COPY vendor/docker/passenger-datadog.sh /etc/service/passenger-datadog/run
+# RUN chmod +x /etc/service/passenger-datadog/run
+
 # Install Ruby gems
 COPY Gemfile* /home/app/webapp/
 WORKDIR /home/app/webapp
 RUN mkdir -p vendor/bundle && \
     chown -R app:app . && \
     chmod -R 755 . && \
     gem update --system && \
-    gem install bundler && \
+    gem install bundler:2.1.4 && \
     /sbin/setuser app bundle install --path vendor/bundle
 
 # Copy webapp folder
@@ -51,11 +64,6 @@ RUN mkdir -p tmp/pids && \
 RUN rm -f /etc/service/sshd/down && \
     /etc/my_init.d/00_regen_ssh_host_keys.sh
 
-# Add Runit script for shoryuken workers
-WORKDIR /home/app/webapp
-RUN mkdir /etc/service/shoryuken
-ADD vendor/docker/shoryuken.sh /etc/service/shoryuken/run
-
 # Run additional scripts during container startup (i.e. not at build time)
 RUN mkdir -p /etc/my_init.d
 

Gemfile

@@ -16,7 +16,7 @@ gem "nokogiri", ">= 1.10.4"
 gem "diffy", "~> 3.2", ">= 3.2.1"
 gem "commonmarker", "~> 0.17.9"
 gem "iso8601", "~> 0.9.0"
-gem "maremma", ">= 4.1"
+gem "maremma", "~> 4.6.1"
 gem "bolognese", "~> 1.5"
 gem "dalli", "~> 2.7", ">= 2.7.6"
 gem "lograge", "~> 0.11.2"
@@ -31,7 +31,6 @@ gem "bcrypt", "~> 3.1.7"
 gem "pwqgen.rb", "~> 0.1.0"
 gem "string_pattern"
 gem "simple_command"
-gem "kaminari", "~> 1.0", ">= 1.0.1"
 gem "cancancan", "~> 2.0"
 gem "country_select", "~> 3.1"
 gem "countries", "~> 2.1", ">= 2.1.2"
@@ -59,19 +58,20 @@ gem "rack-utf8_sanitizer", "~> 1.6"
 gem "turnout", "~> 2.5"
 gem "audited", "~> 4.8"
 gem "git", "~> 1.5"
-gem "graphql", "~> 1.9", ">= 1.9.16"
+gem 'graphql', '~> 1.10', '>= 1.10.8'
 gem "graphql-errors", "~> 0.4.0"
 gem "graphql-batch", "~> 0.4.1"
 gem "batch-loader", "~> 1.4", ">= 1.4.1"
 gem 'graphql-cache', '~> 0.6.0'
-gem 'apollo-federation', '~> 1.0'
+gem 'apollo-federation', '~> 1.0', '>= 1.0.4'
 gem "google-protobuf", "3.10.0.rc.1"
 gem "sprockets", "~> 3.7", ">= 3.7.2"
 gem 'uuid', '~> 2.3', '>= 2.3.9'
 gem 'strong_migrations', '~> 0.6.0'
 gem 'crawler_detect'
 gem 'lhm', '~> 2.2'
 gem 'kt-paperclip', '~> 6.2', '>= 6.2.2'
+gem 'kaminari', '~> 1.2'
 
 group :development, :test do
   gem "rspec-rails", "~> 3.8", ">= 3.8.2"
@@ -91,14 +91,15 @@ group :development do
   gem "spring"
   gem "spring-watcher-listen", "~> 2.0.0"
   gem "spring-commands-rspec"
+  gem "seedbank"
   # gem "httplog", "~> 1.0"
 end
 
 group :test do
   gem "capybara"
   gem "webmock", "~> 3.1"
   gem "hashdiff", [">= 1.0.0.beta1", "< 2.0.0"]
-  gem "vcr", "~> 3.0.3"
+  gem 'vcr', '~> 5.1'
   gem "factory_bot_rails", "~> 4.8", ">= 4.8.2"
   gem "shoulda-matchers", "~> 4.1", ">= 4.1.2"
   gem "faker", "~> 1.9"