Skip to content

Commit

Permalink
performance & security. updates ruby, rails, & gems.
Browse files Browse the repository at this point in the history
  • Loading branch information
jlsync committed Jul 8, 2015
1 parent 92b50a0 commit 7b57dc5
Show file tree
Hide file tree
Showing 28 changed files with 150 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.5
2.2.2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ script:
- bundle exec rake db:schema:load
- bundle exec rspec
rvm:
- 2.1.5
- 2.2.2
notifications:
email:
- [email protected]
11 changes: 6 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
source 'https://rubygems.org'
ruby '2.1.5'
ruby '2.2.2'

gem 'rails', '4.1.9'
gem 'rails', '4.1.12'

gem 'haml'
gem 'sass-rails', '~> 4.0.1'
gem 'compass-rails', github: 'Compass/compass-rails'
gem 'foundation-rails'
gem 'sass-rails', '~> 5.0.1'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.1'
gem 'coffee-rails', '~> 4.0'
gem 'jquery-rails'
gem 'turbolinks'
gem 'simple_form'
Expand All @@ -27,7 +29,6 @@ gem 'omniauth-github'
gem 'delayed_job'
gem 'delayed_job_active_record'

gem 'foundation-rails'
gem 'tzinfo-data'
gem 'icalendar'

Expand Down
Loading

0 comments on commit 7b57dc5

Please sign in to comment.