Skip to content

Stability & Security updates #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielpclark wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Stability & Security updates #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b6062f
stable deps & assets
danielpclark Feb 6, 2017
bfa7ce0
Ruby 2.3.4 & Rails 4.2.8
danielpclark Apr 25, 2017
6ebf38c
Merge branch 'master' into update_deps_jan2017
danielpclark Apr 25, 2017
1a8ef17
ActiveAdmin update with Login & Logout fixes
danielpclark Apr 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
2.3.4
21 changes: 12 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
source 'https://rubygems.org'

ruby '2.3.1'
gem 'rails', '4.2.6'
ruby '2.3.4' # waiting on https://github.com/rails/rails/issues/25125 to upgrade further
gem 'rails', '~> 4.2.8'

#gem "activeadmin_sortable_table" # https://github.com/bolshakov/activeadmin_sortable_table
gem 'activeadmin', '~> 1.0.0.pre2'
gem 'activeadmin-reform', '~> 0.1.4' # https://github.com/bolshakov/activeadmin-reform
gem 'activeadmin_addons', '~> 0.9.2'
gem 'activeadmin', '~> 1.0.0'
gem 'activeadmin-reform', '~> 0.3.0' # https://github.com/bolshakov/activeadmin-reform
gem 'activeadmin_addons', '~> 0.11.0'
gem 'bootstrap-sass', '~> 3.3.6'
gem 'coffee-rails', '~> 4.1.0'
gem 'devise', '~> 3.2' # for activeadmin
gem 'jbuilder', '~> 2.0'
gem 'coffee-rails', '~> 4.2.1'
gem 'devise', '~> 4.2' # for activeadmin
gem 'jbuilder', '~> 2.6'
gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 5.0.5' # later versions break Sprockets import of jquery-ui/datepicker
gem 'json', '~> 1.8' # 1.8.5+ supports Ruby 2.4
gem 'pg', '~> 0.15'
gem 'reform-rails'
gem 'sass', '3.4' # later versions break on Rails 4.2
gem 'sass-rails', '~> 5.0'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'simple_form'
Expand All @@ -35,6 +38,6 @@ group :development do
end

group :production do
gem 'puma', '~> 3.4'
gem 'puma', '~> 3.8'
gem 'rails_12factor', '~> 0.0.3'
end
Loading