Skip to content

Commit f8937b2

Browse files
authored
Merge pull request #1044 from NUARIG/clone-master
Clone master
2 parents f104c56 + 880a932 commit f8937b2

File tree

78 files changed

+907
-768
lines changed

Some content is hidden

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

78 files changed

+907
-768
lines changed

Gemfile

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

66
gem 'pg'
7-
gem 'rails', '6.1.7.6'
7+
gem 'rails', '~> 7.0.8'
88

99
# Use SCSS for stylesheets
1010
gem 'sass-rails', '>= 5'
@@ -23,38 +23,36 @@ gem 'redis', '~> 4.0'
2323
gem 'hotwire-rails'
2424
gem 'jsbundling-rails'
2525
gem 'requestjs-rails'
26-
gem 'turbo-rails', '~> 1.4.0'
26+
gem 'turbo-rails', '~> 2.0.2'
2727

2828
# Reduces boot times through caching; required in config/boot.rb
29-
gem 'bootsnap', '>= 1.1.0', require: false
29+
gem 'bootsnap', '>= 1.17.0', require: false
3030

31-
gem 'devise', '>= 4.8.1'
32-
gem 'devise_saml_authenticatable', '~> 1.9.0'
33-
gem 'draper'
34-
gem 'pundit'
35-
gem 'rubyzip', '~> 2.3.0'
31+
gem 'devise', '4.9.3'
32+
gem 'devise_saml_authenticatable', '~> 1.9.1'
33+
gem 'pundit', '~> 2.3.1'
34+
gem 'rubyzip', '~> 2.3.2'
3635

3736
# frontend
3837
gem 'font-awesome-rails'
39-
gem 'foundation-rails', '~> 6.5.3.0'
38+
gem 'foundation-rails', '~> 6.5.3.0'
4039
gem 'foundation-datepicker-rails'
41-
gem 'friendly_id', '~> 5.4.0'
42-
gem 'haml-rails', '~> 2.0.1'
43-
gem 'jquery-rails', '>= 4.3.5'
40+
gem 'friendly_id', '~> 5.5.0'
41+
gem 'haml-rails', '~> 2.0'
42+
gem 'jquery-rails', '~> 4.6.0'
4443
gem 'jquery-ui-rails'
45-
gem 'pagy', '~> 4.10.1'
46-
gem 'ransack', github: 'activerecord-hackery/ransack'
44+
gem 'pagy', '~> 6.2.0'
45+
gem 'ransack', '~> 3.2.1'
4746
gem 'sprockets-es6'
48-
gem 'trix'
4947

5048
# audits
51-
gem 'discard', '~> 1.2'
52-
gem 'paper_trail', '11.1'
49+
gem 'discard', '~> 1.3'
50+
gem 'paper_trail', '~> 15.1.0'
5351

5452
gem 'exception_notification'
5553

56-
gem 'american_date'
57-
gem 'validates_timeliness', '6.0.0.alpha1'
54+
gem 'american_date', '~> 1.3'
55+
gem 'validates_timeliness', '7.0.0.beta2'
5856

5957
# form_builder
6058
gem "cocoon"
@@ -65,16 +63,17 @@ gem "nested_form"
6563
gem "aws-sdk-s3", require: false
6664

6765
# exports
68-
gem 'caxlsx'
66+
gem 'caxlsx', '~> 3.3'
6967
gem 'caxlsx_rails'
70-
gem 'wicked_pdf'
71-
gem 'wkhtmltopdf-binary'
68+
gem 'wicked_pdf', '~> 2.1.0'
69+
gem 'wkhtmltopdf-binary', '~> 0.12.6'
7270

7371
group :development, :test do
7472
gem 'awesome_print'
7573
gem 'byebug', platforms: %i[mri mingw x64_mingw]
76-
gem 'puma', '~> 4.3.12'
77-
gem 'webrick', '1.7.0'
74+
gem 'puma', '~> 5.6.8'
75+
gem 'rspec-rails', '6.1'
76+
gem 'webrick', '1.8.1'
7877
end
7978

8079
group :development do
@@ -84,10 +83,9 @@ group :development do
8483
gem 'bullet'
8584
gem 'i18n-debug'
8685
gem 'listen', '~> 3.5.1'
87-
gem 'rspec-rails', '~> 5.0.0'
8886
gem 'rubocop'
89-
gem 'spring'
90-
gem 'spring-watcher-listen', '~> 2.0.0'
87+
gem 'spring', '~> 4.0.0'
88+
gem 'spring-watcher-listen', '~> 2.1.0'
9189
gem 'web-console', '>= 3.3.0'
9290

9391
# Use Capistrano for deployment
@@ -99,21 +97,15 @@ group :development do
9997
end
10098

10199
group :test do
102-
gem 'capybara'
100+
gem 'capybara', '~> 3.39.2'
103101
gem 'capybara-select-2'
104102
gem 'factory_bot_rails'
105-
gem 'faker', git: 'https://github.com/stympy/faker.git', branch: 'master'
106-
gem 'pundit-matchers', '~> 1.6.0'
107-
gem 'rspec'
103+
gem 'faker', '~> 3.2.2'
104+
gem 'pundit-matchers', '~> 3.1.2'
105+
gem 'rspec', '3.12.0'
108106
gem 'rails-controller-testing'
109-
gem 'selenium-webdriver'
110-
gem 'simplecov', require: false
111-
112-
# gem 'rspec-rails', git: 'https://github.com/rspec/rspec-rails', branch: 'main'
113-
# gem 'rspec-core', git: 'https://github.com/rspec/rspec-core', branch: 'main'
114-
# gem 'rspec-expectations', git: 'https://github.com/rspec/rspec-expectations', branch: 'main'
115-
# gem 'rspec-mocks', git: 'https://github.com/rspec/rspec-mocks', branch: 'main'
116-
# gem 'rspec-support', git: 'https://github.com/rspec/rspec-support', branch: 'main'
107+
gem 'selenium-webdriver', '~> 4.16.0'
108+
gem 'simplecov', '~> 0.22', require: false
117109
end
118110

119111
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

0 commit comments

Comments
 (0)