Skip to content

Commit 0070cd4

Browse files
authored
feat: Updates HackathonManager to 2.0
feat: Updates HackathonManager to 2.0
2 parents 05d50bb + 0ac7151 commit 0070cd4

File tree

275 files changed

+14668
-1806
lines changed

Some content is hidden

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

275 files changed

+14668
-1806
lines changed

.codeclimate.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
version: "2"
2+
checks:
3+
method-complexity:
4+
config:
5+
threshold: 7
26
plugins:
37
rubocop:
48
enabled: true

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ AWS_ACCESS_KEY_ID="abc"
55
AWS_SECRET_ACCESS_KEY="123"
66
AWS_REGION="us-east-1"
77
AWS_ENDPOINT=""
8-
SPARKPOST_API_KEY="foo"
8+
SENDGRID_API_KEY="foo"

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
/public/assets
2424
.byebug_history
2525

26+
/coverage
27+
2628
# Ignore master key for decrypting credentials and more.
2729
/config/master.key
2830

@@ -33,3 +35,6 @@
3335
/.idea
3436

3537
.generators
38+
39+
# macOS
40+
.DS_Store

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.5
1+
2.6.6

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
## [1.22.4](https://github.com/codeRIT/hackathon-manager/compare/v1.22.3...v1.22.4) (2020-05-26)
22

3-
43
### Bug Fixes
54

65
* **questionnaire:** Fixes error when trying to view a questionnaire modified by a deleted admin ([#236](https://github.com/codeRIT/hackathon-manager/issues/236)) ([](https://github.com/codeRIT/hackathon-manager/commit/2ffe116))

Gemfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55
ruby '>= 2.5'
66

77
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
8-
gem 'rails', '~> 5.2.4.3'
8+
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
@@ -39,7 +39,7 @@ gem 'bootsnap', '>= 1.1.0', require: false
3939

4040
# Authentication
4141
gem 'devise', '~> 4.7'
42-
gem 'omniauth-mlh', '~> 0.1'
42+
gem 'omniauth-mlh', '~> 0.4.1'
4343
gem 'doorkeeper', '~> 5.0'
4444
gem 'devise-doorkeeper'
4545
gem 'omniauth-rails_csrf_protection'
@@ -82,10 +82,9 @@ gem 'sidekiq-cron', '~> 1.1'
8282
gem 'rails-settings-cached', '~> 0.7.2'
8383
gem 'blazer'
8484
gem 'simple_spark'
85-
gem 'sparkpost_rails'
85+
gem 'sendgrid-actionmailer'
8686
gem 'httparty'
8787
gem 'rollbar', '~> 2.8'
88-
gem 'skylight'
8988
gem 'rubyzip', '>= 1.3.0'
9089
gem 'rails_12factor', group: :production
9190

0 commit comments

Comments
 (0)