Skip to content

Commit

Permalink
Merge pull request #591 from coopdevs/develop
Browse files Browse the repository at this point in the history
v3.4.0
  • Loading branch information
sseerrggii authored Jan 10, 2021
2 parents fece25d + 5b05319 commit 6dfc961
Show file tree
Hide file tree
Showing 21 changed files with 164 additions and 168 deletions.
23 changes: 11 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

ruby File.read('.ruby-version').strip

gem 'rails', '~> 6.0.2'
gem 'rails', '~> 6.1.1'
gem 'rails-i18n', '~> 6.0.0'
gem 'rdiscount', '~> 2.2.0.1'
gem 'activeadmin', '~> 2.9.0'
Expand All @@ -11,17 +11,17 @@ gem 'pundit', '~> 2.1.0'
gem 'pg', '~> 1.2.1'
gem 'json_translate', '~> 4.0.0'
gem 'devise', '~> 4.7.1'
gem "http_accept_language", '~> 2.1.1'
gem 'http_accept_language', '~> 2.1.1'
gem 'unicorn', '~> 5.5.1'
gem 'kaminari', '~> 1.2.1'
gem 'simple_form', '~> 5.0.2'
gem 'rollbar', '~> 2.22.1'
gem 'prawn', '~> 2.2.0'
gem 'prawn', '~> 2.4.0'
gem 'prawn-table', '~> 0.2.2'
gem 'pg_search', '~> 2.3.5'
gem 'skylight', '~> 4.1.2'
gem 'sidekiq', '~> 6.0.0'
gem 'sidekiq-cron', '~> 1.1.0'
gem 'skylight', '~> 4.3.2'
gem 'sidekiq', '~> 6.1.2'
gem 'sidekiq-cron', '~> 1.2.0'

# Assets
gem 'jquery-rails', '~> 4.3.5'
Expand All @@ -34,12 +34,11 @@ group :development do
gem 'listen', '~> 3.2.0'
gem 'rubocop', '~> 1.6', require: false
gem 'rubocop-rails', '~> 2.9', require: false
gem 'web-console', '~> 4.0.1'
gem 'web-console', '~> 4.1.0'
gem 'capistrano', '~> 3.1'
gem 'capistrano-rails', '~> 1.1'
gem 'capistrano-rbenv', '~> 2.1'
gem 'airbrussh', require: false
gem 'localeapp', '2.1.1', require: false
gem 'localeapp', '~> 3.1', require: false
gem 'letter_opener', '~> 1.7.0'
gem 'dotenv-rails', '~> 2.7.1'
end
Expand All @@ -52,11 +51,11 @@ group :test do
gem 'rspec-rails', '~> 4.0.0'
gem 'rails-controller-testing'
gem 'database_cleaner', '~> 1.8.5'
gem 'shoulda-matchers', '~> 4.4.0'
gem 'shoulda-matchers', '~> 4.4'
gem 'fabrication', '~> 2.20'
gem 'faker', '~> 1.9'
gem 'faker', '~> 2.15'
gem 'capybara', '~> 3.29'
gem 'selenium-webdriver', '~> 3.142'
gem 'webdrivers', '~> 4.4.0'
gem 'webdrivers', '~> 4.4'
gem 'simplecov', '~> 0.17', require: false
end
Loading

0 comments on commit 6dfc961

Please sign in to comment.