Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
daf749e
rails update complete
reedstrm May 16, 2019
5ae49a7
generated new schema
reedstrm May 16, 2019
061d0e8
WIP - tests run!
reedstrm May 17, 2019
7c8a1d8
mostly deprecation warning fixes
reedstrm May 20, 2019
b3712c0
remove one patch; add another
reedstrm May 24, 2019
52b171e
Lots of de-squeeling
reedstrm May 24, 2019
77b9c15
inhert from ApplicationRecord
reedstrm May 30, 2019
828373d
gem updates
reedstrm May 30, 2019
b77ef45
more deprecation fixes
reedstrm May 30, 2019
f680d15
disable reaper - not compatible w/ DatabaseCleaner during tests
reedstrm May 31, 2019
d1e07ac
add rubocop-rails for dev
reedstrm May 31, 2019
d9a7dde
add copyright_holder to test data
reedstrm May 31, 2019
1d537f4
mostly deprecation removal - little bit more squeel removal
reedstrm May 31, 2019
8291fa9
update expected for school_type field
reedstrm May 31, 2019
38ae440
fix edit typo
reedstrm May 31, 2019
8a79bf9
file needs to be inside params, I think
reedstrm May 31, 2019
c2d7eeb
add more copyright_holders
reedstrm May 31, 2019
e277c9d
upgrade past security issue
reedstrm May 31, 2019
89fc704
more copyright_holders
reedstrm May 31, 2019
619b78a
fix with_id fetching
reedstrm May 31, 2019
e614154
need at least one author and one copyright_holder
reedstrm May 31, 2019
b26f04e
Use Rack file uploader
reedstrm Jun 3, 2019
d833547
fix the _other_ with_id scope
reedstrm Jun 3, 2019
1f649f4
more author and copyright_holder setup fixes
reedstrm Jun 3, 2019
2dff709
mostly import de-squeel
reedstrm Jun 3, 2019
ec9cef4
fixup kramdown math import
reedstrm Jun 4, 2019
9e55a49
callback chain termination
reedstrm Jun 4, 2019
a8a3326
fix attachment unique_asset test
reedstrm Jun 4, 2019
abb5fb6
throw (and expect) abort
reedstrm Jun 4, 2019
520f186
fixup weirdness w/ empty return sets
reedstrm Jun 4, 2019
ee32879
tag migrations with version
reedstrm Jun 5, 2019
42b3cf3
method_alias_chain deprecation (minimal fix)
reedstrm Jun 5, 2019
7f30270
belongs_to default required
reedstrm Jun 5, 2019
ec0f8b8
ActionController::Parameters deprecation fix
reedstrm Jun 5, 2019
3aa6af7
Rails 5.1 updates - mostly config secret key access changes and gem u…
reedstrm Jun 6, 2019
a94596e
gem version bumps for 5.2; remove one error class
reedstrm Jun 6, 2019
bf94ea8
De-squeel a migration, and update schema
reedstrm Jun 6, 2019
2cf6dc5
5.2 defaults and rails cache key change
reedstrm Jun 7, 2019
b431dea
force children to be saved w/ autosave: true
reedstrm Jun 7, 2019
5400cfd
do not autosave publishable
reedstrm Jun 7, 2019
3674a4c
reorder save for exercise and associated publication models
reedstrm Jun 7, 2019
5c8d6fe
update schema - uuid-ossp extension needed?
reedstrm Jun 7, 2019
ae55ecd
remove comments - unpin/upgrade pg gem
reedstrm Jun 10, 2019
ed145b9
cover all error cases
reedstrm Jun 10, 2019
adfac93
Don't use arel unless we need to
reedstrm Jun 10, 2019
780411e
delete double version scope
reedstrm Jun 10, 2019
821036d
whitespace
reedstrm Jun 10, 2019
ffcd6dd
extraneous #
reedstrm Jun 10, 2019
c63078d
last bits of arel_table cleanup - move vars up scope, catch space pot…
reedstrm Jun 10, 2019
d3f2915
switched to bundler-2
reedstrm Jun 10, 2019
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
# Ignore bundler config
/.bundle

# Ignore installed gems
vendor

# Ignore the default SQLite database and yaml_db database files
/db/*.sqlite3*
/db/data.yml*
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ before_script:
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- gem install bundler:2.0.1

40 changes: 20 additions & 20 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ git_source(:github) do |repo_name|
end

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.11'
gem 'rails', '~> 5.2.3'

# Bootstrap
gem 'bootstrap-sass'
Expand All @@ -24,7 +24,7 @@ gem 'compass-rails'
gem 'uglifier', '>= 1.3.0'

# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
gem 'coffee-rails', '~> 4.2.2'

gem 'mini_racer'

Expand Down Expand Up @@ -59,26 +59,24 @@ gem 'openstax_utilities'
gem 'whenever'

# Talks to Accounts (latest version is broken)
gem 'omniauth-oauth2', '~> 1.3.1'
gem 'omniauth-oauth2'

# OpenStax Accounts integration
gem 'openstax_accounts', '~> 7.12.0'
gem 'openstax_accounts'


# Access control for API's
gem 'doorkeeper'

# API versioning and documentation
gem 'representable', '~> 3.0.0'
gem 'openstax_api', '~> 8.3.0'
gem 'openstax_api'
gem 'apipie-rails'
gem 'maruku'

# Lev framework
gem 'lev'

# Ruby dsl for SQL queries
gem 'squeel'

# Contract management
gem 'fine_print'

Expand All @@ -94,8 +92,7 @@ gem 'mimemagic'
gem 'mini_magick'

# Markdown parsing
# Pinned for Rails 4.X
gem 'kramdown', '1.6.0'
gem 'kramdown'

# Read Excel xlsx spreadsheet files
gem 'roo'
Expand All @@ -122,8 +119,7 @@ gem 'acts_as_votable'
gem 'scout_apm', '~> 3.0.x'

# PostgreSQL database
# Pinned for rails 4.X
gem 'pg', '~> 0.15'
gem 'pg'

# HTTP requests
gem 'httparty'
Expand All @@ -134,7 +130,7 @@ gem 'a15k_client',
branch: 'master'

# Notify developers of Exceptions in production
gem 'openstax_rescue_from', '~> 3.0.0'
gem 'openstax_rescue_from'

# Sentry integration (the require disables automatic Rails integration since we use rescue_from)
gem 'sentry-raven', require: 'raven/base'
Expand All @@ -156,6 +152,9 @@ gem 'redis-rails'
# Respond to ELB healthchecks in /ping and /ping/
gem 'openstax_healthcheck'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '~> 1.4.0', require: false

group :development, :test do
# Get env variables from .env file
gem 'dotenv-rails'
Expand All @@ -172,19 +171,19 @@ group :development, :test do
# Call 'debugger' anywhere in the code to stop execution and get a debugger console
gem 'byebug'

# Some controller test support
gem 'rails-controller-testing'

# Use RSpec for tests
gem 'rspec-rails'

# Mute asset pipeline log messages
gem 'quiet_assets'

# Fixture replacement
# Pinned for rails 4.X
gem 'factory_bot_rails', '< 5.0.0'
gem 'factory_bot_rails'

# Lorem Ipsum
# Pinned to avoid 18n problem
gem 'faker', '1.6.6'
gem 'faker'

# Database cleaning functionality for tests
gem 'database_cleaner'
Expand Down Expand Up @@ -224,8 +223,9 @@ group :test do
# Codecov integration
gem 'codecov', require: false

# Test after-commit hooks
gem 'test_after_commit'
# Rubocop
gem 'rubocop-rails'

end

group :production do
Expand Down
Loading