Skip to content

Commit

Permalink
Merge pull request #211 from sanger/upgrade-rails
Browse files Browse the repository at this point in the history
Upgrade Ruby & Rails (Mini LIMS)
  • Loading branch information
KatyTaylor authored Jul 15, 2022
2 parents edd11b4 + 13b4ade commit b3d388d
Show file tree
Hide file tree
Showing 34 changed files with 309 additions and 222 deletions.
1 change: 0 additions & 1 deletion .coveralls.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ruby_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup database
run: bundle exec rake db:setup
- name: Test & publish code coverage
uses: paambaati/codeclimate-action@v2.7.5
uses: paambaati/codeclimate-action@v3.0.0
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID || '5e399530a457db7a41cd5785ce0536b79e9022b3c2d4382f101310b3b166eb38' }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.6
2.7.6
11 changes: 4 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 4.2.6'
gem 'rails', '~> 6.1.6'
# Use mysql2 as the database for Active Record
gem 'mysql2'
# Use SCSS for stylesheets
Expand All @@ -14,7 +14,7 @@ gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'sdoc', '~> 2.4.0', group: :doc # TODO: change to using yard (using this for other apps).

gem 'bootstrap-sass', '3.4.1'

Expand All @@ -32,20 +32,16 @@ gem 'exception_notification'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

gem 'coveralls', require: false

group :development, :test do
# Call 'binding.pry' anywhere in the code to stop execution and get a debugger console
gem 'pry'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem 'web-console', '~> 4.0.4'
# displays speed badge for every html page
gem 'rack-mini-profiler'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
Expand All @@ -64,6 +60,7 @@ group :test do
gem 'launchy'
gem 'rspec-collection_matchers'
gem 'rspec-rails', '~> 3.5.0'
gem 'simplecov', require: false
gem 'timecop'
# Keep webdriver in sync with chrome to prevent frustrating CI failures
gem 'webdrivers', require: false
Expand Down
Loading

0 comments on commit b3d388d

Please sign in to comment.