Skip to content

Commit

Permalink
Merge pull request #444 from pulibrary/443-update-gem
Browse files Browse the repository at this point in the history
 Update rack gem
  • Loading branch information
hackartisan authored Nov 26, 2018
2 parents 61a339c + 401a9ab commit a9b5fd3
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 70 deletions.
8 changes: 0 additions & 8 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 16
# Cop supports --auto-correct.
# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
# Include: **/Gemfile, **/gems.rb
Bundler/OrderedGems:
Exclude:
- 'Gemfile'

# Offense count: 10
Capybara/FeatureMethods:
Exclude:
Expand Down
96 changes: 35 additions & 61 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,105 +1,79 @@
source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
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 'jquery-rails'
gem 'rack', '>= 2.0.6'
gem 'rails', '~> 5.0'
gem 'sass-rails', '~> 5.0'
gem 'sdoc', '~> 0.4.0', group: :doc

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Unicorn as the app server
# gem 'unicorn'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'rspec-rails'
gem 'pry-rails'
gem 'pry-byebug'
gem 'simplecov', require: false
gem 'coveralls', require: false
gem 'vcr'
gem 'webmock', require: false
gem 'capybara'
gem 'capybara-selenium'
gem 'factory_bot_rails', require: false
gem 'capistrano-rails'
gem 'capistrano-passenger'
gem 'capistrano-rails'
gem 'capistrano-rails-console'
gem 'capybara'
gem 'capybara-selenium'
gem 'coveralls', require: false
gem 'database_cleaner'
gem 'factory_bot_rails', require: false
gem 'pry-byebug'
gem 'pry-rails'
gem 'rails-controller-testing'
# Use sqlite3 as the database for Active Record
gem 'rspec-rails'
gem 'simplecov', require: false
gem 'sqlite3'
gem 'vcr'
gem 'webmock', require: false
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'web-console', '~> 2.0'
end

group :production, :test do
gem 'pg', '~> 0.20'
end

gem 'blacklight', '6.14.1'
gem 'almond-rails', '~> 0.1'
gem 'bixby'
gem 'blacklight', '6.14.1'
gem 'blacklight-gallery', '>= 0.3.0'
gem 'blacklight-oembed'
gem 'blacklight-spotlight', github: 'projectblacklight/spotlight', branch: "master"
gem 'solr_wrapper'
gem 'rsolr', '~> 1.0.6'
gem 'ddtrace'
gem 'devise'
gem 'devise-guests', '~> 0.3'
gem 'friendly_id', github: 'norman/friendly_id'
gem 'sitemap_generator'
gem 'blacklight-gallery', '>= 0.3.0'
gem 'blacklight-oembed'
gem 'devise_invitable'
gem 'iso-639'
gem 'friendly_id', github: 'norman/friendly_id'
gem 'iiif-presentation'
gem 'iso-639'
gem 'lograge'
gem 'logstash-event'
gem 'omniauth', '~> 1.3.2'
gem 'omniauth-cas'
gem 'sneakers'
gem 'open_uri_redirections'
gem 'sidekiq'
gem 'pul_uv_rails', github: 'pulibrary/pul_uv_rails', branch: 'master'
gem 'redis-namespace'
gem 'string_rtl'
gem 'riiif'
gem 'rsolr', '~> 1.0.6'
gem 'sidekiq'
gem 'sitemap_generator'
gem 'sneakers'
gem 'solr_wrapper'
gem 'sprockets', '~> 3.7'
gem 'sprockets-es6'
gem 'sprockets-rails'
gem 'sprockets', '~> 3.7'
gem 'almond-rails', '~> 0.1'
gem 'pul_uv_rails', github: 'pulibrary/pul_uv_rails', branch: 'master'
gem 'riiif'
gem 'string_rtl'

# PUL Assets
gem 'pul-assets', github: 'pulibrary/pul_assets'
# gem 'spotlight-resources-iiif', github: 'pulibrary/spotlight-resources-iiif', branch: 'default_vocab'
gem 'dalli'
gem 'ruby-prof', require: false
gem 'honeybadger', '~> 2.0'
gem 'nokogiri', '~> 1.8.1'
gem 'pul-assets', github: 'pulibrary/pul_assets'
gem 'ruby-prof', require: false
gem 'rubyzip', '>= 1.2.2'
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ GEM
pry-rails (0.3.4)
pry (>= 0.9.10)
public_suffix (2.0.5)
rack (2.0.5)
rack (2.0.6)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
Expand Down Expand Up @@ -614,6 +614,7 @@ DEPENDENCIES
pry-rails
pul-assets!
pul_uv_rails!
rack (>= 2.0.6)
rails (~> 5.0)
rails-controller-testing
redis-namespace
Expand Down

0 comments on commit a9b5fd3

Please sign in to comment.