Merge f993df5 into c92725e

.github/workflows/rspec.yml

@@ -25,31 +25,28 @@ jobs:
           /usr/bin/
         key: ${{ hashFiles('Gemfile.lock') }}
 
-    - name: Install bundler
-      run: gem.ruby2.7 install bundler -v 1.17.3
-
     - name: Install ruby dependencies
       run: |
         gem.ruby2.7 install mini_racer -v 0.6.3
-        bundler.ruby2.7 _1.17.3_ install
+        bundler.ruby2.7 install
 
     - name: Set up the environment
       run: |
         cp config/database.test.yml config/database.yml
         cp config/site.example.yml config/site.yml
-        bundler.ruby2.7 _1.17.3_ exec rake db:migrate RAILS_ENV=test
+        bundler.ruby2.7 exec rake db:migrate RAILS_ENV=test
 
     - if: ${{ matrix.type == 'rubocop' }}
       name: Run rubocop
-      run: bundler.ruby2.7 _1.17.3_ exec rubocop
+      run: bundler.ruby2.7 exec rubocop
 
     - if: ${{ contains(fromJson('["features", "helpers", "mailer", "models"]'), matrix.type) }}
       name: Run spec
-      run: bundler.ruby2.7 _1.17.3_ exec rspec spec/${{ matrix.type }}/
+      run: bundler.ruby2.7 exec rspec spec/${{ matrix.type }}/
 
     - if: ${{ matrix.type == 'coverage' }}
       name: Run spec
-      run: bundler.ruby2.7 _1.17.3_ exec rspec
+      run: bundler.ruby2.7 exec rspec
 
     - if: ${{ matrix.type == 'coverage' }}
       name: Coveralls

Dockerfile

@@ -6,21 +6,20 @@ RUN usermod -u $CONTAINER_USERID tsp
 
 WORKDIR /app
 
-RUN gem.ruby2.7 install bundler -v 1.17.3
 RUN gem.ruby2.7 install mini_racer -v 0.6.3
 RUN gem.ruby2.7 install ffi -v '1.15.5'
 
 # Configure our bundle
 # ENV BUNDLE_FORCE_RUBY_PLATFORM=true
-RUN bundler.ruby2.7 _1.17.3_  config build.ffi --enable-system-libffi; \
-    bundler.ruby2.7 _1.17.3_  config build.nokogiri --use-system-libraries; \
-    bundler.ruby2.7 _1.17.3_  config build.sassc --disable-march-tune-native; \
-    bundler.ruby2.7 _1.17.3_  config build.nio4r --with-cflags='-Wno-return-type'
+RUN bundler.ruby2.7  config build.ffi --enable-system-libffi; \
+    bundler.ruby2.7  config build.nokogiri --use-system-libraries; \
+    bundler.ruby2.7  config build.sassc --disable-march-tune-native; \
+    bundler.ruby2.7  config build.nio4r --with-cflags='-Wno-return-type'
 
 ADD Gemfile /app/Gemfile
 ADD Gemfile.lock /app/Gemfile.lock
 
-RUN bundler.ruby2.7 _1.17.3_ install --jobs=3 --retry=3
+RUN bundler.ruby2.7 install --jobs=3 --retry=3
 
 RUN chown -R tsp /app
 

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.11.3'
+gem 'rails', '>= 5.0.0.rc2', '< 5.0.99'
 gem 'responders'
 
 # Choose your weapon
@@ -9,10 +9,11 @@ gem 'sqlite3', '~> 1.3.13'
 # gem 'mysql2', '~> 0.4.10'
 
 gem 'bigdecimal', '1.3.5'
-gem 'bundler', '< 2.0'
 gem 'psych', '< 4.0'
 gem 'sprockets', '< 4.0'
 
+gem 'rails-i18n'
+
 # Use SCSS for stylesheets
 gem 'sass-rails'
 # Use Uglifier as compressor for JavaScript assets
@@ -50,14 +51,15 @@ gem 'carrierwave'
 gem 'caxlsx_rails'
 gem 'clockwork'
 gem 'cocoon'
+gem 'country_select'
 gem 'daemons'
 gem 'date_validator'
 gem 'devise'
 gem 'devise_ichain_authenticatable', '>= 0.3.0'
-gem 'espinita'
+gem 'espinita', git: 'https://github.com/michelson/espinita.git',
+                ref: '2dc027edc838ee5de0d68558f1758273ccc01636'
 gem 'inherited_resources'
 gem 'kaminari'
-gem 'localized_country_select'
 # Newer prawn lost the template support in Document
 # Would be good to replace with something else
 gem 'prawn', '~> 0.13.0'
@@ -110,6 +112,3 @@ end
 
 # Deploy with Capistrano
 # gem 'capistrano'
-
-# To use debugger
-# gem 'debugger'