Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade/rails 5.2.8.1 #40

Open
wants to merge 48 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d9aa506
feat: add new with_eu_legislation param to taxon concepts endpoint an…
lucacug Oct 12, 2022
2af9021
feat: retrieve current eu listings
lucacug Oct 12, 2022
46aaa73
feat: add current eu listings to taxon concept api response
lucacug Oct 12, 2022
e1a85c2
feat: add eu_listings fields description
lucacug Oct 13, 2022
6874965
Merge pull request #36 from unepwcmc/feat/add-eu-listings
lucacug Oct 17, 2022
6f1c629
chore: remove uservoice, which is no longer working
pdl Aug 6, 2024
1d97e2b
chore: upgrade ruby from 2.2.3 to 2.3.1 (and devise from 3.5.4 to 3.5…
pdl Aug 6, 2024
5153d7a
docs: add getting started instructions to the readme
pdl Aug 6, 2024
03131f9
chore: add deps for ed25519 keys and update net-ssh for cap
pdl Aug 6, 2024
a3bf36f
feat: implement feedback modal
pdl Aug 7, 2024
4af58dc
feat: allow deploying from branches other than master
pdl Aug 7, 2024
43d1821
style: tweak alignment of feedback link in footer
pdl Aug 8, 2024
17cdd0b
Merge pull request #37 from unepwcmc/feat/remove-uservoice
pdl Aug 8, 2024
017c707
fix: Most urls should be https
pdl Nov 11, 2024
a20da5c
chore: upgrade rails gem to 5.0.7.2, and upgrade other gems as required
pdl Nov 11, 2024
db69976
chore: rack now throws an error if you just allow everything via CORS
pdl Nov 11, 2024
ae27b4e
chore: method devise_parameter_sanitizer.for no longer exists
pdl Nov 11, 2024
8928535
chore: bundle exec rails app:update
pdl Nov 11, 2024
fdd0d88
fix: deprecation warnings
pdl Nov 11, 2024
191f230
chore: fix tests by updating rabl, capybara and groupdate
pdl Nov 11, 2024
6a2dd6c
chore: upgrade pg and specify versions of successors to schema_plus
pdl Nov 12, 2024
7920195
chore: bundle exec rails generate devise:install
pdl Nov 12, 2024
1a59631
chore: upgrade susy to deal with deprecation warnings
pdl Nov 12, 2024
b98209e
chore: upgrade susy
pdl Nov 12, 2024
73ee736
chore: fix noisy error when testing
pdl Nov 12, 2024
c6d5c63
chore: factorybot "static" attribute definitions have been deprecated
pdl Nov 12, 2024
64717ed
chore: use a different test db to SAPI repo as they break each other …
pdl Nov 12, 2024
1f8d561
chore: remove config/initializers/new_framework_defaults.rb as applic…
pdl Nov 12, 2024
a0e9821
chore: update rails to 5.1.7 and run bundle exec rails app:update
pdl Nov 12, 2024
6c3d2bb
chore: class_name takes a string; namespace constant is deprecated
pdl Nov 12, 2024
4b94bc6
chore: models should inherit from ApplicationRecord, not ActiveRecord…
pdl Nov 12, 2024
f6eb416
chore: upgrade apipipe
pdl Nov 12, 2024
f23ffa9
chore: add gem "listen"
pdl Nov 12, 2024
9e37e5d
chore: fix cors middleware definition
pdl Nov 12, 2024
f5298e0
chore: update traco
pdl Nov 13, 2024
8374a6d
chore: if rails.root contains spaces this will fail
pdl Nov 13, 2024
a02c609
chore: test support models need a lot more annotation since Rails 5.1
pdl Nov 13, 2024
862bfe5
chore: api_requests.user_id is nullable
pdl Nov 13, 2024
6e94fd7
chore: skip a test where the mock models break assumptions on Rails 5.1
pdl Nov 13, 2024
9b53662
chore: remove new framework defaults file for rails 5.1
pdl Nov 13, 2024
02f466e
chore: fix mailer secrets in staging/production environments
pdl Nov 14, 2024
5cd217a
chore: update rails to 5.2.8.1
pdl Nov 14, 2024
4ff6de0
chore: bundle exec rails app:update
pdl Nov 14, 2024
995e4fb
chore: things spotted in railsdiff
pdl Nov 15, 2024
416f228
chore: add new files in rails 5.2
pdl Nov 15, 2024
002ca90
chore: remove resolved TODO comment
pdl Nov 18, 2024
f97be9c
chore: update will_paginate, fixing tests which were breaking due to …
pdl Nov 18, 2024
7268541
chore: switch to Rails 5.2 framework defaults
pdl Nov 18, 2024
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
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.3
2.3.1
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: ruby
bundler_args: --without development production staging
rvm:
- 2.2.3
- 2.3.1
addons:
postgresql: 9.4
# uncomment this line if your project needs to run something other than `rake`:
Expand Down
149 changes: 110 additions & 39 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,71 +1,142 @@
source 'https://rubygems.org'

gem 'rails', '4.2.5.2'
gem 'apipie-rails' # Documentation
gem 'devise', '>= 3.5.4'
gem 'annotate'
gem 'sass-rails'#, '~> 3.2.3'
gem 'uglifier'#, '>= 1.0.3'
gem 'susy', '~> 1.0.9'
gem 'compass'#, '>= 0.12.2'
gem 'compass-rails'#, '>= 1.0.3'
gem 'will_paginate' #, '~> 3.0.6'
gem 'api_pagination_headers'
gem 'traco'
gem 'httparty'
gem 'select2-rails'
gem 'groupdate'
gem "chartkick"
gem 'rails', '5.2.8.1'

# Dependency resolution for Rails 5
gem 'railties', '5.2.8.1'
gem 'loofah', '~> 2.19.1'
gem 'nokogiri', '~> 1.6.0'
gem 'rails-dom-testing', '~> 2.0', '< 2.2.0'

# Use Puma as the app server
gem 'puma', '~> 3.11'

gem 'apipie-rails', '~> 0.6'

# devise provides authentication
gem 'devise', '>= 3.5.10'

# annotate maintains comments at the top of model files describing the schema,
# using the database as the source of truth
gem 'annotate', '3.1.0'

# Frontend CSS and minification
gem 'sass-rails', '5.0.7'
gem 'uglifier', '~> 2.7.2'
gem 'susy', '~> 2.2.14'
gem 'compass', '~> 1.0.3'
gem 'compass-rails', '~> 4.0.0'

# Frontend components
gem 'select2-rails', '~> 3.5.9.3'
gem 'chartkick', '~> 1.3.2'

# Provides group_by_day et al. on ActiveRecord models and queries
gem 'groupdate', '~> 4.0.0'

# pagination
gem 'will_paginate', '~> 4.0.0'
gem 'api_pagination_headers', '>= 2.1.1'

# i18n
gem 'traco', '~> 5.3.3' # TODO: switch to mobility

# HTTP user agent
gem 'httparty', '~> 0.13.3'

group :test do
gem 'shoulda'
gem 'capybara'
gem 'factory_girl_rails'
gem 'simplecov', require: false
gem 'codeclimate-test-reporter', require: nil
gem 'link_header'
gem 'launchy'
gem 'mocha'
# Test assertion library.
# UPGRADE TODO: Shoulda is tested and supported against Ruby 3.0+, Rails 6.1+,
# RSpec 3.x, Minitest 4.x, and Test::Unit 3.x. For Ruby < 3 and Rails < 6.1
# compatibility, please use v4.0.0.
gem 'shoulda', '~> 4'

# Integration testing
gem 'capybara', '~> 2.8'

# Helps build test fixtures
gem 'factory_girl_rails', '~> 4.5.0' # UPGRADE TODO: gem 'factory_bot_rails', '4.11.1'

# coverage reports
gem 'simplecov', '~> 0.17.1', require: false
# gem 'codeclimate-test-reporter', require: nil # UPGRADE: removed

# Used in test/controllers/api/v1/taxon_concepts_test.rb to parse HTTP
# link headers and verify they're correct
gem 'link_header', '~> 0.0.8'

# For laun
# gem 'launchy', '~> 2.4.3'

# Mocks and stubs. Not equivalent to https://mochajs.org/
gem 'mocha', '~> 1.1.0'
end

group :staging, :production do
gem 'dotenv-rails'
end

# Use postgresql as the database for Active Record
gem 'pg'
gem 'schema_plus'
gem 'pg', '~> 1.2'

# gem 'schema_plus', '~> 2.1.0' # was 1.8.7
gem 'schema_associations', '~> 1.2.7';
gem 'schema_auto_foreign_keys', '~> 0.1.3';
gem 'schema_validations', '~> 2.3.0';

# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
gem 'jquery-rails', '~> 4.6.0'

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
gem 'turbolinks', '~> 2.5.3'

# Build JSON / XML API
gem 'rabl'
gem 'rabl', '~> 0.14.0'

# Also add either `oj` or `yajl-ruby` as the JSON parser
gem 'oj'
gem 'oj', '~> 2.12.1'

# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'sdoc', '~> 0.4.0', group: :doc

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', group: :development
# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '~> 3.7.0'
gem 'listen', '>= 3.0.5', '< 3.2'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', '~> 1.6.4'
gem 'spring-watcher-listen', '~> 2.0.0'

# Capistrano for rails deployment
gem 'capistrano', '~> 3.4.0'
gem 'capistrano-rails'
gem 'capistrano-bundler'
gem 'capistrano-rvm'
gem 'capistrano-rails', '~> 1.6.3'
gem 'capistrano-bundler', '~> 2.1.1'
gem 'capistrano-rvm', '~> 0.1.2'
gem 'capistrano-maintenance', '~> 1.0', require: false
gem 'capistrano-passenger', '~> 0.1.1', require: false
gem 'rack-cors', :require => 'rack/cors'

# Support ed25519 SSH keys
gem 'rbnacl', '4.0.2'
gem 'rbnacl-libsodium', '1.0.16'
gem 'bcrypt_pbkdf', '1.1.0'
gem 'ed25519', '1.2.4'
end

group :development, :test do
gem 'byebug'
# A better debugger
gem 'byebug', '~> 4.0.2'
end

gem 'appsignal'
# Error monitoring
gem 'appsignal', '~> 3.3.11'
Loading