Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
eeccf7b
build(deps): Bump ini from 1.3.5 to 1.3.8 in /website
dependabot[bot] Dec 25, 2020
ec44141
build(deps): Bump redcarpet from 3.5.0 to 3.5.1
dependabot[bot] Jan 11, 2021
198a9f5
build(deps): bump minitest-reporters from 1.4.2 to 1.4.3
dependabot[bot] Feb 7, 2021
6e977c1
build(deps): bump bootsnap from 1.4.6 to 1.7.1 (#573)
dependabot[bot] Feb 7, 2021
9cdf282
Merge branch 'develop' into dependabot/bundler/develop/minitest-repor…
peterkos Feb 7, 2021
5f5e274
build(deps): bump omniauth-mlh from 0.4.1 to 0.4.2
dependabot[bot] Feb 7, 2021
e4f71dc
build(deps): bump file_validators from 2.3.0 to 3.0.0
dependabot[bot] Feb 7, 2021
de50c35
Merge pull request #574 from codeRIT/dependabot/bundler/develop/file_…
cbaudouinjr Feb 7, 2021
696408f
Merge branch 'develop' into dependabot/bundler/develop/omniauth-mlh-0…
cbaudouinjr Feb 7, 2021
533e92d
build(deps): bump puma from 4.3.5 to 5.2.1
dependabot[bot] Feb 7, 2021
8485da7
Merge pull request #575 from codeRIT/dependabot/bundler/develop/omnia…
cbaudouinjr Feb 7, 2021
101f688
Merge branch 'develop' into dependabot/bundler/develop/puma-5.2.1
cbaudouinjr Feb 7, 2021
28fa428
build(deps): bump better_errors from 2.7.1 to 2.9.1
dependabot[bot] Feb 8, 2021
b2c5065
fix(questionnaire): fixed whitespace and readded agreements to edit page
JeremyRudman Feb 8, 2021
7679218
fix(data_export): fixed form bad indentation
JeremyRudman Feb 9, 2021
dad9e6b
feat(stats): added coutnry to checked-in datatable
JeremyRudman Feb 9, 2021
b35ee36
Update app/views/manage/questionnaires/_form.html.haml
JeremyRudman Feb 9, 2021
7b79b26
Update checked_in_datatable.rb
JeremyRudman Feb 9, 2021
e002397
refactor(questionnaire): changed special needs placeholder (#584)
JeremyRudman Feb 9, 2021
3087365
Merge branch 'develop' into dependabot/bundler/develop/minitest-repor…
cbaudouinjr Feb 9, 2021
19e863f
Merge pull request #579 from codeRIT/dependabot/bundler/develop/bette…
cbaudouinjr Feb 9, 2021
258fdc1
build(deps): bump simplecov from 0.18.5 to 0.21.2
dependabot[bot] Feb 9, 2021
599dd86
build(deps): bump validate_url from 1.0.11 to 1.0.13
dependabot[bot] Feb 9, 2021
cf9aea6
Merge branch 'develop' into dependabot/bundler/develop/puma-5.2.1
cbaudouinjr Feb 9, 2021
a885c56
refactor(questionnaire): changed questionnaire error
JeremyRudman Feb 9, 2021
ca664c1
Merge pull request #576 from codeRIT/dependabot/bundler/develop/puma-…
cbaudouinjr Feb 9, 2021
65c2739
build(deps): bump bootstrap from 4.3.1 to 4.6.0
dependabot[bot] Feb 9, 2021
7448627
Merge branch 'develop' into dependabot/bundler/develop/minitest-repor…
cbaudouinjr Feb 9, 2021
734b2cb
Merge pull request #577 from codeRIT/dependabot/bundler/develop/minit…
cbaudouinjr Feb 9, 2021
894b52e
Merge branch 'develop' into dependabot/bundler/develop/simplecov-0.21.2
cbaudouinjr Feb 9, 2021
a504722
Merge pull request #580 from codeRIT/dependabot/bundler/develop/simpl…
cbaudouinjr Feb 9, 2021
40174ab
Merge branch 'develop' into dependabot/bundler/develop/validate_url-1…
cbaudouinjr Feb 9, 2021
ffd7fb7
fix(schedule): orginizers now have read only access
JeremyRudman Feb 9, 2021
d69657f
build(deps): bump aws-sdk-s3 from 1.72.0 to 1.88.0
dependabot[bot] Feb 9, 2021
932d827
Merge pull request #581 from codeRIT/dependabot/bundler/develop/valid…
cbaudouinjr Feb 9, 2021
eb0fad3
Merge branch 'develop' into dependabot/bundler/develop/aws-sdk-s3-1.88.0
cbaudouinjr Feb 9, 2021
0b7b7d7
Merge pull request #586 from codeRIT/dependabot/bundler/develop/aws-s…
cbaudouinjr Feb 9, 2021
402e81b
Merge branch 'develop' into dependabot/bundler/develop/bootstrap-4.6.0
cbaudouinjr Feb 9, 2021
0f0ebd2
Merge pull request #587 from codeRIT/dependabot/bundler/develop/boots…
cbaudouinjr Feb 9, 2021
1d62854
Merge branch 'develop' into dependabot/bundler/redcarpet-3.5.1
cbaudouinjr Feb 9, 2021
07d1015
Merge branch 'develop' into dependabot/npm_and_yarn/website/ini-1.3.8
cbaudouinjr Feb 9, 2021
f52b5a6
Merge pull request #527 from codeRIT/dependabot/bundler/redcarpet-3.5.1
cbaudouinjr Feb 9, 2021
20d0694
Merge branch 'develop' into dependabot/npm_and_yarn/website/ini-1.3.8
cbaudouinjr Feb 9, 2021
ddb2520
Merge pull request #453 from codeRIT/dependabot/npm_and_yarn/website/…
cbaudouinjr Feb 9, 2021
b717dc2
build(deps): bump simple_form from 5.0.2 to 5.0.3
dependabot[bot] Feb 9, 2021
a65e8bd
build(deps): bump font-awesome-rails from 4.7.0.5 to 4.7.0.6
dependabot[bot] Feb 9, 2021
9459e75
build(deps): bump codeclimate-test-reporter from 0.6.0 to 1.0.7
dependabot[bot] Feb 9, 2021
e792800
build(deps): bump shoulda-matchers from 4.4.1 to 4.5.1
dependabot[bot] Feb 9, 2021
58e0d55
Merge branch 'develop' into dependabot/bundler/develop/simple_form-5.0.3
cbaudouinjr Feb 9, 2021
f4774cc
Merge branch 'develop' into dependabot/bundler/develop/font-awesome-r…
cbaudouinjr Feb 9, 2021
3b050da
Merge branch 'develop' into dependabot/bundler/develop/codeclimate-te…
cbaudouinjr Feb 9, 2021
a997cd8
Merge branch 'develop' into dependabot/bundler/develop/shoulda-matche…
cbaudouinjr Feb 9, 2021
12865f4
Merge pull request #593 from codeRIT/dependabot/bundler/develop/shoul…
cbaudouinjr Feb 9, 2021
0c26119
Merge branch 'develop' into dependabot/bundler/develop/codeclimate-te…
cbaudouinjr Feb 9, 2021
169d17e
Merge branch 'develop' into dependabot/bundler/develop/font-awesome-r…
cbaudouinjr Feb 9, 2021
a49256b
Merge branch 'develop' into dependabot/bundler/develop/simple_form-5.0.3
cbaudouinjr Feb 9, 2021
34eb8eb
Merge pull request #590 from codeRIT/dependabot/bundler/develop/simpl…
cbaudouinjr Feb 9, 2021
1f57fb2
Merge branch 'develop' into dependabot/bundler/develop/font-awesome-r…
cbaudouinjr Feb 9, 2021
cef45fb
Merge pull request #591 from codeRIT/dependabot/bundler/develop/font-…
cbaudouinjr Feb 9, 2021
39766b1
Merge branch 'develop' into dependabot/bundler/develop/codeclimate-te…
cbaudouinjr Feb 9, 2021
ebaea48
Merge pull request #592 from codeRIT/dependabot/bundler/develop/codec…
cbaudouinjr Feb 9, 2021
d3b04b4
build(deps): bump simple_form from 5.0.3 to 5.1.0
dependabot[bot] Feb 10, 2021
5c52eb7
build(deps): bump test-unit from 3.3.6 to 3.4.0
dependabot[bot] Feb 10, 2021
07f6be8
build(deps): bump blazer from 2.2.5 to 2.4.2
dependabot[bot] Feb 10, 2021
09282f2
build(deps): bump groupdate from 5.0.0 to 5.2.2
dependabot[bot] Feb 10, 2021
01233a3
build(deps): bump dotenv-rails from 2.7.5 to 2.7.6
dependabot[bot] Feb 10, 2021
98cfb20
fix(event_test): fixed test due to permissions change
JeremyRudman Feb 10, 2021
31bc121
build(deps): Updates gem cache
cbaudouinjr Feb 11, 2021
6d441d1
Merge pull request #599 from codeRIT/update-gem-cache
cbaudouinjr Feb 11, 2021
dd1680d
Merge branch 'develop' into dependabot/bundler/develop/simple_form-5.1.0
cbaudouinjr Feb 11, 2021
4fab182
build(deps): Updates gem cache
cbaudouinjr Feb 11, 2021
87f4e54
Merge pull request #594 from codeRIT/dependabot/bundler/develop/simpl…
cbaudouinjr Feb 11, 2021
59bb405
Merge branch 'develop' into dependabot/bundler/develop/test-unit-3.4.0
cbaudouinjr Feb 11, 2021
2ec534b
build(deps): Updates gem cache
cbaudouinjr Feb 11, 2021
c05fb76
build(deps): Fixes nokogiri platform dependence
cbaudouinjr Feb 11, 2021
490b4b5
Merge pull request #600 from codeRIT/nokogiri
cbaudouinjr Feb 11, 2021
2c7a675
Merge branch 'develop' into dependabot/bundler/develop/test-unit-3.4.0
cbaudouinjr Feb 11, 2021
a13cd55
Merge branch 'develop' into dependabot/bundler/develop/blazer-2.4.2
cbaudouinjr Feb 11, 2021
fd778e7
build(deps): Updates vendor cache
cbaudouinjr Feb 11, 2021
f5d62bb
Merge pull request #595 from codeRIT/dependabot/bundler/develop/test-…
cbaudouinjr Feb 11, 2021
bda01c4
Merge branch 'develop' into dependabot/bundler/develop/blazer-2.4.2
cbaudouinjr Feb 11, 2021
c430e88
Merge branch 'develop' into dependabot/bundler/develop/groupdate-5.2.2
cbaudouinjr Feb 11, 2021
55c4ec4
build(deps): Updates gem cache
cbaudouinjr Feb 11, 2021
e1e666b
Merge branch 'develop' into dependabot/bundler/develop/dotenv-rails-2…
cbaudouinjr Feb 11, 2021
3afaed8
build(deps): Updates gem cache
cbaudouinjr Feb 11, 2021
5f2d4cb
Merge pull request #596 from codeRIT/dependabot/bundler/develop/blaze…
cbaudouinjr Feb 11, 2021
115b74b
Merge branch 'develop' into dependabot/bundler/develop/groupdate-5.2.2
cbaudouinjr Feb 11, 2021
01f02f6
Merge pull request #588 from codeRIT/hm-572
cbaudouinjr Feb 11, 2021
c3c8395
Merge pull request #597 from codeRIT/dependabot/bundler/develop/group…
cbaudouinjr Feb 11, 2021
bcf4231
Merge branch 'develop' into dependabot/bundler/develop/dotenv-rails-2…
cbaudouinjr Feb 11, 2021
81b4199
Merge pull request #598 from codeRIT/dependabot/bundler/develop/doten…
cbaudouinjr Feb 11, 2021
1f48b27
build(deps): bump audited from 4.9.0 to 4.10.0
dependabot[bot] Feb 11, 2021
be14817
build(deps): bump capybara from 3.33.0 to 3.35.3
dependabot[bot] Feb 11, 2021
6dddf1f
build(deps): bump roadie-rails from 2.1.1 to 2.2.0
dependabot[bot] Feb 11, 2021
d45b6e8
build(deps): bump timecop from 0.9.1 to 0.9.4
dependabot[bot] Feb 11, 2021
c165eb8
Merge branch 'develop' into dependabot/bundler/develop/audited-4.10.0
cbaudouinjr Feb 12, 2021
21b29ad
build(deps): Updates gem cache
cbaudouinjr Feb 12, 2021
a282cda
Merge branch 'develop' into dependabot/bundler/develop/capybara-3.35.3
cbaudouinjr Feb 12, 2021
ad622ed
build(deps): Updates gem cache
cbaudouinjr Feb 12, 2021
f1e91d9
Merge branch 'develop' into dependabot/bundler/develop/roadie-rails-2…
cbaudouinjr Feb 12, 2021
16d5d2f
build(deps): Updates gem cache
cbaudouinjr Feb 12, 2021
491448a
Merge branch 'develop' into dependabot/bundler/develop/timecop-0.9.4
cbaudouinjr Feb 12, 2021
6e895df
build(deps): Updates gem cache
cbaudouinjr Feb 12, 2021
448e3de
Merge pull request #602 from codeRIT/dependabot/bundler/develop/audit…
cbaudouinjr Feb 12, 2021
050526e
Merge branch 'develop' into dependabot/bundler/develop/capybara-3.35.3
cbaudouinjr Feb 12, 2021
85e1668
Merge pull request #603 from codeRIT/dependabot/bundler/develop/capyb…
cbaudouinjr Feb 12, 2021
c69128a
Merge branch 'develop' into dependabot/bundler/develop/roadie-rails-2…
cbaudouinjr Feb 12, 2021
07a3e94
Merge pull request #604 from codeRIT/dependabot/bundler/develop/roadi…
cbaudouinjr Feb 12, 2021
7d2e8fc
Merge branch 'develop' into dependabot/bundler/develop/timecop-0.9.4
cbaudouinjr Feb 12, 2021
32e912d
Merge pull request #605 from codeRIT/dependabot/bundler/develop/timec…
cbaudouinjr Feb 12, 2021
6328389
build(deps): bump binding_of_caller from 0.8.0 to 1.0.0
dependabot[bot] Feb 12, 2021
ee146e7
build(deps): bump rollbar from 2.26.0 to 3.1.2
dependabot[bot] Feb 12, 2021
27902b1
build(deps): bump font-awesome-rails from 4.7.0.6 to 4.7.0.7
dependabot[bot] Feb 12, 2021
1988979
added country to applied attendies
JeremyRudman Feb 12, 2021
8e1c839
Merge branch 'hm-567' of https://github.com/codeRIT/hackathon-manager…
JeremyRudman Feb 12, 2021
3622246
fix houndi complaint
JeremyRudman Feb 12, 2021
499aa48
add country to main questionnaires datatable
JeremyRudman Feb 12, 2021
1418a30
Merge pull request #583 from codeRIT/hm-567
cbaudouinjr Feb 12, 2021
5ce5ef2
build(deps): Updates gem cache
cbaudouinjr Feb 12, 2021
be58b44
build(deps): Updates gem cache
cbaudouinjr Feb 12, 2021
d11b70f
build(deps): Updates gem cache
cbaudouinjr Feb 12, 2021
ec8642b
Merge pull request #608 from codeRIT/dependabot/bundler/develop/bindi…
cbaudouinjr Feb 12, 2021
5b2daa8
Merge branch 'develop' into dependabot/bundler/develop/rollbar-3.1.2
cbaudouinjr Feb 12, 2021
7335d8d
Merge pull request #609 from codeRIT/dependabot/bundler/develop/rollb…
cbaudouinjr Feb 12, 2021
69295d3
Merge branch 'develop' into dependabot/bundler/develop/font-awesome-r…
cbaudouinjr Feb 12, 2021
07eed7f
build(deps): Updates GitHub Actions to cache gems
cbaudouinjr Feb 12, 2021
d453423
Merge pull request #613 from codeRIT/hm-612
cbaudouinjr Feb 12, 2021
52cf29d
Merge branch 'develop' into dependabot/bundler/develop/font-awesome-r…
cbaudouinjr Feb 12, 2021
4977c36
build(deps): bump factory_bot_rails from 6.0.0 to 6.1.0
dependabot[bot] Feb 12, 2021
3dd1858
Merge pull request #610 from codeRIT/dependabot/bundler/develop/font-…
cbaudouinjr Feb 12, 2021
1d520f4
Merge branch 'develop' into dependabot/bundler/develop/factory_bot_ra…
cbaudouinjr Feb 12, 2021
4fdc6f9
build(deps): Updates gem cache
cbaudouinjr Feb 12, 2021
6f0ab8e
Merge pull request #614 from codeRIT/dependabot/bundler/develop/facto…
cbaudouinjr Feb 12, 2021
b92c679
Update _form.html.haml
JeremyRudman Feb 13, 2021
563d64c
feat: Adds API support for checking attendees in
cbaudouinjr Feb 14, 2021
cc1c99c
refactor: Replaces brackets with do blocks
cbaudouinjr Feb 14, 2021
9a41e0e
Merge pull request #616 from codeRIT/hm-615
cbaudouinjr Feb 14, 2021
2f8f533
Merge pull request #589 from codeRIT/hm-569
cbaudouinjr Feb 14, 2021
a1ec306
Merge pull request #582 from codeRIT/hm-434
cbaudouinjr Feb 14, 2021
a4e576c
Merge pull request #618 from codeRIT/develop
cbaudouinjr Feb 14, 2021
14ad24c
feature: Redirects to application page on sign in (#617)
cicadaenjoyer Feb 14, 2021
05e52d7
changed class of delete to btn-outline-danger
sjv01180 Feb 14, 2021
6a07afb
Merge pull request #620 from codeRIT/HM-491
cbaudouinjr Feb 14, 2021
77aee09
refactor: Updates check-in/out flash verbiage
cbaudouinjr Feb 14, 2021
6e9ce63
fix: Fixes tests for updated verbiage
cbaudouinjr Feb 14, 2021
74d9365
refactor: Updates variable names
cbaudouinjr Feb 14, 2021
9cb5c16
fix: Fixes missing name error in data exports
cbaudouinjr Feb 14, 2021
d2c8ae3
Merge pull request #624 from codeRIT/hm-534a
cbaudouinjr Feb 14, 2021
175c0b4
Merge pull request #622 from codeRIT/hm-621
cbaudouinjr Feb 14, 2021
1c1074e
build(deps): bump spring from 2.1.0 to 2.1.1
dependabot[bot] Feb 15, 2021
3a31c9c
build(deps): bump aws-sdk-s3 from 1.88.0 to 1.88.1
dependabot[bot] Feb 15, 2021
abdafa4
build(deps): bump bootsnap from 1.7.1 to 1.7.2
dependabot[bot] Feb 15, 2021
109edba
build(deps): bump sendgrid-actionmailer from 3.0.2 to 3.1.1
dependabot[bot] Feb 15, 2021
2dc4a77
build(deps): Updates gem cache
cbaudouinjr Feb 15, 2021
3d4c296
build(deps): Updates gem cache
cbaudouinjr Feb 15, 2021
06691f6
build(deps): Updates gem cache
cbaudouinjr Feb 15, 2021
bf9f5ed
build(deps): Updates gem cache
cbaudouinjr Feb 15, 2021
648e8b2
Merge pull request #626 from codeRIT/dependabot/bundler/develop/sprin…
cbaudouinjr Feb 15, 2021
3dcfae7
Merge branch 'develop' into dependabot/bundler/develop/aws-sdk-s3-1.88.1
cbaudouinjr Feb 15, 2021
5ad3088
Merge branch 'develop' into dependabot/bundler/develop/bootsnap-1.7.2
cbaudouinjr Feb 15, 2021
f19e86e
Merge pull request #628 from codeRIT/dependabot/bundler/develop/boots…
cbaudouinjr Feb 15, 2021
1b2b552
Merge branch 'develop' into dependabot/bundler/develop/sendgrid-actio…
cbaudouinjr Feb 15, 2021
d5bafa2
Merge pull request #629 from codeRIT/dependabot/bundler/develop/sendg…
cbaudouinjr Feb 15, 2021
bdb12a9
Merge branch 'develop' into dependabot/bundler/develop/aws-sdk-s3-1.88.1
cbaudouinjr Feb 15, 2021
3209439
Merge pull request #627 from codeRIT/dependabot/bundler/develop/aws-s…
cbaudouinjr Feb 15, 2021
43f7f5b
Merge branch 'develop' into 2.2.1
cbaudouinjr Feb 15, 2021
14eb861
Merge pull request #630 from codeRIT/2.2.1
cbaudouinjr Feb 15, 2021
72704f8
Merge branch 'master' into develop
cbaudouinjr Feb 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true
- name: Install gems
run: |
gem install pkg-config
Expand Down
18 changes: 9 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gem 'rails', '~> 5.2.4.4'
# Use mysql as the database for Active Record
gem 'mysql2', '>= 0.4.4', '< 0.6.0'
# Use Puma as the app server
gem 'puma', '~> 4.3'
gem 'puma', '~> 5.2'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 6.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -41,7 +41,7 @@ gem 'bootsnap', '>= 1.1.0', require: false

# Authentication
gem 'devise', '~> 4.7'
gem 'omniauth-mlh', '~> 0.4.1'
gem 'omniauth-mlh', '~> 0.4.2'
gem 'doorkeeper', '~> 5.0'
gem 'devise-doorkeeper'
gem 'omniauth-rails_csrf_protection'
Expand All @@ -57,7 +57,7 @@ gem 'ajax-datatables-rails', '~> 1.0'
gem 'roadie-rails'
gem 'chartkick', '~> 3.4'
gem 'groupdate'
gem 'font-awesome-rails', '~> 4.0' # needed for icon helpers
gem 'font-awesome-rails', '~> 4.7' # needed for icon helpers
gem 'mustache', '~> 1.0'

# Assets
Expand All @@ -66,7 +66,7 @@ gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'selectize-rails'
gem 'highcharts-rails', '~> 6.0'
gem 'bootstrap', '~> 4.3.1'
gem 'bootstrap', '~> 4.6.0'
gem 'fullcalendar-rails'
gem 'momentjs-rails'

Expand All @@ -76,7 +76,7 @@ gem 'redcarpet'
# Model extensions
gem 'strip_attributes'
gem 'validate_url'
gem 'audited', '~> 4.7'
gem 'audited', '~> 4.10'

# Background job processing
gem 'sidekiq', '< 7'
Expand All @@ -88,7 +88,7 @@ gem 'blazer'
gem 'simple_spark'
gem 'sendgrid-actionmailer'
gem 'httparty'
gem 'rollbar', '~> 2.8'
gem 'rollbar', '~> 3.1'
gem 'rubyzip', '>= 1.3.0'
gem 'rails_12factor', group: :production

Expand All @@ -114,13 +114,13 @@ group :development do
end

group :test do
gem 'test-unit', '~> 3.0'
gem 'test-unit', '~> 3.4'
gem 'shoulda', '~> 4.0.0'
gem 'shoulda-matchers', '~> 4.4.0'
gem 'shoulda-matchers', '~> 4.5.1'
gem 'minitest-reporters'
gem 'valid_attribute'
gem 'factory_bot_rails'
gem 'codeclimate-test-reporter', '~> 0.6.0', require: nil
gem 'codeclimate-test-reporter', '~> 1.0.7', require: nil
gem 'rails-controller-testing' # Rails 4 fallback
gem 'webmock', '~> 3.4'
gem 'timecop'
Expand Down
Loading