Skip to content

Commit

Permalink
Rails6 (#1061)
Browse files Browse the repository at this point in the history
* [rails6]: upgrade rails to 5.2.7

* [rails6]: upgrade rails to 5.2.7 + webpacker to 6

* [rails6]: get rid of compass

* [rails6]: move to sprockets 4

* [rails6]: update binstubs

* [rails6]: remove rails version dependecies in plugins

* [rails6]: prepare application.rb for upgrade to 6.0

* [rails6]: remove obsolete code

* [rails6]: first working version on rails6

* [rails6]: upgrade rails to 5.2.7

* [rails6]: upgrade rails to 5.2.7 + webpacker to 6

* [rails6]: get rid of compass

* [rails6]: move to sprockets 4

* [rails6]: update binstubs

* [rails6]: remove rails version dependecies in plugins

* [rails6]: prepare application.rb for upgrade to 6.0

* [rails6]: remove obsolete code

* [rails6]: first working version on rails6

* [rails6]: replace sass_inline_svg with sassc-inline-svg

* [rails6]: update bundler to 2.3.9 in Dockerfile

* [rails6]: use zeitwerk

* [rails6]: fix bugs in custom lib

* [rails6]: build binstubs using bundler

* [rails6]: fix rspec tests

* [rails6]: replace factory_girl with factory_bot

* [rails6]: upgrade pg in dockerfile

* [rails6]: move a babel plugin to dependencies section to make it available in prod

* [rails6]: add 0.0.0.0 to hosts to allow connections inside the pod

* [rails6]: remove 0.0.0.0 from config.hosts

* [rails6]: fix inquiry_metrics
  • Loading branch information
andypf authored Apr 4, 2022
1 parent f3e04bd commit 6fc4797
Show file tree
Hide file tree
Showing 163 changed files with 1,673 additions and 2,502 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,10 @@ vendor_4.2.4/
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
.yarn-integrity
/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
29 changes: 14 additions & 15 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@ source 'https://rubygems.org'
# # unf is pulled in by the ruby-arc-client
gem 'unf', '>= 0.2.0beta2'

gem 'rails', '~> 5.2.5' # Don't use 5.1.3 because of redirect errors in tests (scriptr vs. script name in ActionPack)
gem 'webpacker', '~> 5.0' # Check package.json -> "@rails/webpacker"
gem 'rails', '6.1.2' # Don't use 5.1.3 because of redirect errors in tests (scriptr vs. script name in ActionPack)
gem 'webpacker' # Check package.json -> "@rails/webpacker"

# Views and Assets
gem 'compass-rails'
gem 'sass-rails'
gem 'bootstrap-sass'
gem 'uglifier'
gem 'coffee-rails'
Expand All @@ -26,11 +23,11 @@ gem 'haml-rails'
gem 'simple_form'
gem 'redcarpet'
gem 'spinners'
gem 'sass_inline_svg'

gem 'friendly_id'
gem 'high_voltage'
gem 'simple-navigation' # Navigation menu builder
gem 'font-awesome-sass'
gem 'font-awesome-sass', '~>4'
gem 'kaminari', '~> 1.2.1'

gem 'responders'
Expand All @@ -39,7 +36,7 @@ gem 'responders'
gem 'react-rails', '~> 2.2.1'

# Database
gem 'pg'
gem 'pg', '1.3.4'
gem 'activerecord-session_store'

# Openstack
Expand Down Expand Up @@ -79,7 +76,7 @@ gem 'puma', '= 4.3.9', require: false
###################### PLUGINS #####################

# backlist plugins (global)
black_list = %w[bare_metal_hana] # e.g. ['compute']
black_list = [] # e.g. ['compute']
if ENV.key?('BLACK_LIST_PLUGINS')
ENV['BLACK_LIST_PLUGINS'].split(',').each { |plugin_name| black_list << plugin_name.strip }
end
Expand Down Expand Up @@ -109,6 +106,11 @@ group :production do
gem 'rails_stdout_logging', require: 'rails_stdout_logging/rails'
end

group :development, :production do
# Views and Assets
gem 'sass-rails'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 3.0'
Expand All @@ -128,18 +130,15 @@ group :development, :test do
# Testing

gem 'rspec-rails'
gem 'factory_girl_rails', '~> 4.0'
# gem 'factory_girl_rails', '~> 4.0'
gem "factory_bot_rails"
gem 'database_cleaner'

gem 'pry-rails'
gem 'prettier'
end

group :development, :test do
gem 'rspec'
gem 'listen'
end

group :test do
gem 'guard-rspec'
gem 'rails-controller-testing'
end
Loading

0 comments on commit 6fc4797

Please sign in to comment.