Skip to content

Commit 036cac8

Browse files
authoredFeb 15, 2021
Merge pull request #632 from codeRIT/develop
master <- 2.2.1
2 parents a4ca101 + 72704f8 commit 036cac8

File tree

149 files changed

+215
-149
lines changed

Some content is hidden

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

149 files changed

+215
-149
lines changed
 

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
5454
with:
5555
ruby-version: ${{ matrix.ruby-version }}
56+
bundler-cache: true
5657
- name: Install gems
5758
run: |
5859
gem install pkg-config

‎Gemfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gem 'rails', '~> 5.2.4.4'
99
# Use mysql as the database for Active Record
1010
gem 'mysql2', '>= 0.4.4', '< 0.6.0'
1111
# Use Puma as the app server
12-
gem 'puma', '~> 4.3'
12+
gem 'puma', '~> 5.2'
1313
# Use SCSS for stylesheets
1414
gem 'sass-rails', '~> 6.0'
1515
# Use Uglifier as compressor for JavaScript assets
@@ -41,7 +41,7 @@ gem 'bootsnap', '>= 1.1.0', require: false
4141

4242
# Authentication
4343
gem 'devise', '~> 4.7'
44-
gem 'omniauth-mlh', '~> 0.4.1'
44+
gem 'omniauth-mlh', '~> 0.4.2'
4545
gem 'doorkeeper', '~> 5.0'
4646
gem 'devise-doorkeeper'
4747
gem 'omniauth-rails_csrf_protection'
@@ -57,7 +57,7 @@ gem 'ajax-datatables-rails', '~> 1.0'
5757
gem 'roadie-rails'
5858
gem 'chartkick', '~> 3.4'
5959
gem 'groupdate'
60-
gem 'font-awesome-rails', '~> 4.0' # needed for icon helpers
60+
gem 'font-awesome-rails', '~> 4.7' # needed for icon helpers
6161
gem 'mustache', '~> 1.0'
6262

6363
# Assets
@@ -66,7 +66,7 @@ gem 'jquery-rails'
6666
gem 'jquery-ui-rails'
6767
gem 'selectize-rails'
6868
gem 'highcharts-rails', '~> 6.0'
69-
gem 'bootstrap', '~> 4.3.1'
69+
gem 'bootstrap', '~> 4.6.0'
7070
gem 'fullcalendar-rails'
7171
gem 'momentjs-rails'
7272

@@ -76,7 +76,7 @@ gem 'redcarpet'
7676
# Model extensions
7777
gem 'strip_attributes'
7878
gem 'validate_url'
79-
gem 'audited', '~> 4.7'
79+
gem 'audited', '~> 4.10'
8080

8181
# Background job processing
8282
gem 'sidekiq', '< 7'
@@ -88,7 +88,7 @@ gem 'blazer'
8888
gem 'simple_spark'
8989
gem 'sendgrid-actionmailer'
9090
gem 'httparty'
91-
gem 'rollbar', '~> 2.8'
91+
gem 'rollbar', '~> 3.1'
9292
gem 'rubyzip', '>= 1.3.0'
9393
gem 'rails_12factor', group: :production
9494

@@ -114,13 +114,13 @@ group :development do
114114
end
115115

116116
group :test do
117-
gem 'test-unit', '~> 3.0'
117+
gem 'test-unit', '~> 3.4'
118118
gem 'shoulda', '~> 4.0.0'
119-
gem 'shoulda-matchers', '~> 4.4.0'
119+
gem 'shoulda-matchers', '~> 4.5.1'
120120
gem 'minitest-reporters'
121121
gem 'valid_attribute'
122122
gem 'factory_bot_rails'
123-
gem 'codeclimate-test-reporter', '~> 0.6.0', require: nil
123+
gem 'codeclimate-test-reporter', '~> 1.0.7', require: nil
124124
gem 'rails-controller-testing' # Rails 4 fallback
125125
gem 'webmock', '~> 3.4'
126126
gem 'timecop'

0 commit comments

Comments
 (0)