Skip to content

Commit

Permalink
Merge pull request #380 from themarshallproject/develop
Browse files Browse the repository at this point in the history
v0.4.0
  • Loading branch information
GabeIsman committed Sep 13, 2020
2 parents 5febc8c + f37b2c0 commit a5514e3
Show file tree
Hide file tree
Showing 29 changed files with 258 additions and 266 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby '2.5.7'

gem 'rails', '~> 5.2.4'
gem 'rails', '~> 6.0'
gem 'pg', '~> 0.21'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
Expand Down Expand Up @@ -32,7 +32,7 @@ gem 'aws-sdk-sqs', '~> 1.30'

group :development, :test do
gem 'byebug'
gem 'rspec-rails', '~> 3.8'
gem 'rspec-rails'
gem 'guard-rspec', require: false
gem 'factory_bot_rails', '~> 6.1'
gem 'database_cleaner'
Expand Down
Loading

0 comments on commit a5514e3

Please sign in to comment.