Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #23 from davegregg/master
Browse files Browse the repository at this point in the history
Update project to Ruby 2.4.2, Rails 5.1.4, and Rake 2.0.3
  • Loading branch information
Caitlin Bales (MSFT) authored Oct 9, 2017
2 parents dd46459 + 669f4ee commit a78d955
Show file tree
Hide file tree
Showing 99 changed files with 406 additions and 1,888 deletions.
9 changes: 9 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,12 @@ Lint/HandleExceptions:
Exclude:
- 'bin/rails'
- 'bin/rake'

Naming/FileName:
Enabled: false

Style/FrozenStringLiteralComment:
Enabled: false

Style/MutableConstant:
Enabled: false
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.2.1
- 2.4.2
# use container builds
sudo: false
before_install: gem update --remote bundler
Expand Down
52 changes: 18 additions & 34 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,54 +1,38 @@
source 'https://rubygems.org'
ruby '2.4.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.3'
gem 'rails', '5.1.4'
# Use a legacy version of Rack which supports Ruby 2.1.9
gem 'rack', '2.0.3'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# 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', '~> 4.1.0'
# 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'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '5'
# bundle exec rake doc:rails generates the API under doc/api.
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 'sdoc', group: :doc

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger
# console
gem 'byebug'
gem 'byebug', platforms: %i[mri mingw x64_mingw]

# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem 'listen', '>= 3.0.5', '< 3.2'

gem 'rubocop', '0.50.0', require: false

# 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'

# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '>= 3.3.0'
end

# Authentication resources
gem 'omniauth-microsoft_v2_auth', :git => "git://github.com/cbales/omniauth-microsoft_graph"
omniauth_src = 'git://github.com/cbales/omniauth-microsoft_graph'
gem 'omniauth-microsoft_v2_auth', git: omniauth_src

# On Windows systems we need tzinfo-data
gem 'tzinfo-data'

gem 'rubocop', '0.34.2'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
Loading

0 comments on commit a78d955

Please sign in to comment.