Skip to content

Commit

Permalink
Merge 8edf9ab into 369c2d8
Browse files Browse the repository at this point in the history
  • Loading branch information
jgreben committed Sep 7, 2018
2 parents 369c2d8 + 8edf9ab commit 42dec87
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 25 deletions.
30 changes: 11 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ gem 'sqlite3'
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

# A gem for adding Stanford University Libraries styles to Rails applications
gem 'sul_styles'

# Use sass-powered bootstrap
gem 'bootstrap-sass', "~> 3.3.4"
# Use bootstrap_form for easy form building
Expand All @@ -23,8 +21,6 @@ gem 'sass-rails', '~> 5.0'
gem 'jquery-rails', '< 4.1'
# Use cancan for authorization
gem 'cancan'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
# composite_primary_keys for models that have two or more primary_keys
gem 'composite_primary_keys', '=8.1.4'
# Use Unicorn as the app server
Expand All @@ -43,18 +39,16 @@ gem 'systemu'
gem 'honeybadger'
# For uploading files from Ruby applications
gem 'carrierwave', '~> 1.0'

# to compress javascript
gem 'uglifier'
# For fiscal year functions
gem 'fiscali'
#To filter Sal3BatchRequestsBatches to day of the week
gem 'has_scope'
# To parse tsv for DigitalBookplate data
gem 'tsv'
# loofah 2.2.1 Fixes known security vulnerability: CVE-2018-8048
gem 'loofah', '~> 2.2.1'
# sprockets ~> 3.7.2 Fixes know security vulnerability: CVE-2018-3760: Path Traversal in Sprockets
gem 'sprockets', '~> 3.7.2'
# Rails javascript runtime environment
gem 'therubyracer'

group :production do
# This is for the rails 4.2 version. See https://github.com/rsim/oracle-enhanced#rails-42
Expand All @@ -65,16 +59,6 @@ group :production do
gem 'ruby-plsql'
end

gem 'therubyracer'

group :deployment do
gem 'capistrano', '~> 3.0'
gem 'capistrano-bundler'
gem 'capistrano-rails'
gem 'capistrano-passenger'
gem 'dlss-capistrano'
end

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debug console
gem 'byebug'
Expand All @@ -100,3 +84,11 @@ group :development do
gem 'web-console', '~> 2.0'
gem 'ruby-plsql'
end

group :deployment do
gem 'capistrano', '~> 3.0'
gem 'capistrano-bundler'
gem 'capistrano-rails'
gem 'capistrano-passenger'
gem 'dlss-capistrano'
end
10 changes: 4 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ GEM
railties (>= 3.0.0)
faraday (0.14.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.21)
ffi (1.9.25)
fiscali (2.4.3)
activesupport
globalid (0.4.1)
Expand All @@ -171,9 +171,9 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
mime-types (3.1)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2018.0812)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
Expand All @@ -182,7 +182,7 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.2.0)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
okcomputer (1.17.1)
parallel (1.12.1)
Expand Down Expand Up @@ -336,7 +336,6 @@ DEPENDENCIES
honeybadger
jbuilder (~> 2.0)
jquery-rails (< 4.1)
loofah (~> 2.2.1)
nokogiri
okcomputer
rails (~> 4.2.9)
Expand All @@ -347,7 +346,6 @@ DEPENDENCIES
sass-rails (~> 5.0)
scss_lint
sdoc (~> 0.4.0)
sprockets (~> 3.7.2)
sqlite3
sul_styles
systemu
Expand Down

0 comments on commit 42dec87

Please sign in to comment.