Skip to content

Commit

Permalink
Merge pull request #7 from sul-dlss/update-dependencies
Browse files Browse the repository at this point in the history
Update to Rails 5
  • Loading branch information
cbeer committed Sep 27, 2016
2 parents dc582cf + 666259a commit 009fcd9
Show file tree
Hide file tree
Showing 12 changed files with 209 additions and 137 deletions.
33 changes: 19 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,43 @@ source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7.1'
gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
gem 'sqlite3', group: [:development, :test]
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use mysql as the database when running on the server environment
gem 'mysql2', '~> 0.3.0'
gem 'mysql2', '~> 0.3.0', group: :production
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
gem 'uglifier', '>= 2.7.2'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
gem 'coffee-rails', '~> 4.2', '>= 4.2.1'
# 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'
gem 'turbolinks', '~> 5'
# 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 'jbuilder', '~> 2.5'

# 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

# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0', group: :development
group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console'
gem 'listen', '~> 3.0.5'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand All @@ -44,6 +47,8 @@ group :development, :test do
# RSpec for testing
gem 'rspec-rails', '~> 3.0'

gem 'rails-controller-testing'

# Capybara for feature/integration tests
gem 'capybara'

Expand Down

0 comments on commit 009fcd9

Please sign in to comment.