Skip to content

Commit 1724fa4

Browse files
authored
Merge pull request #973 from NUARIG/release/1.17
Release/1.17
2 parents 4587af2 + 2647b3d commit 1724fa4

File tree

143 files changed

+6415
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+6415
-445
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@
4242
/spec/examples.txt
4343
/coverage
4444
/coverage/*
45+
46+
/app/assets/builds/*
47+
!/app/assets/builds/.keep

Gemfile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,36 @@ gem 'pg'
77
gem 'rails', '6.1.5'
88

99
# Use SCSS for stylesheets
10-
gem 'sass-rails', '~> 5.0'
11-
# Use Uglifier as compressor for JavaScript assets
12-
gem 'uglifier', '>= 1.3.0'
10+
gem 'sass-rails', '>= 5'
11+
# Use Terser as compressor for JavaScript assets
12+
gem 'terser', '~> 1.1'
1313

1414
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
15-
gem 'turbolinks', '~> 5'
15+
# gem 'turbolinks', '~> 5'
1616
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
1717
gem 'jbuilder', '~> 2.5'
1818
# Use Redis adapter to run Action Cable in production
1919
gem 'redis', '~> 4.0'
2020
# Use ActiveModel has_secure_password
2121
# gem 'bcrypt', '~> 3.1.7'
2222

23+
gem 'hotwire-rails'
24+
gem 'jsbundling-rails'
25+
gem 'turbo-rails', '~> 1.1'
26+
2327
# Reduces boot times through caching; required in config/boot.rb
2428
gem 'bootsnap', '>= 1.1.0', require: false
2529

26-
gem 'devise', '>= 4.7.1'
27-
gem 'devise_saml_authenticatable', '~> 1.6.3'
30+
gem 'devise', '>= 4.8.1'
31+
gem 'devise_saml_authenticatable', '~> 1.9.0'
2832
gem 'draper'
2933
gem 'pundit'
3034
gem 'rubyzip', '~> 2.3.0'
3135

3236
# frontend
3337
gem 'font-awesome-rails'
38+
gem 'foundation-rails', '~> 6.5.3.0'
3439
gem 'foundation-datepicker-rails'
35-
gem 'foundation-rails', '~> 6.5.1.0'
3640
gem 'friendly_id', '~> 5.4.0'
3741
gem 'haml-rails', '~> 2.0.1'
3842
gem 'jquery-rails', '>= 4.3.5'
@@ -54,7 +58,7 @@ gem 'validates_timeliness', '6.0.0.alpha1'
5458
# form_builder
5559
gem "cocoon"
5660
gem "nested_form"
57-
gem "select2-rails"
61+
# gem "select2-rails"
5862

5963
# s3
6064
gem "aws-sdk-s3", require: false

0 commit comments

Comments
 (0)