Skip to content

Commit

Permalink
Bump to use ActiveRecord and ActiveSupport 4.2.1
Browse files Browse the repository at this point in the history
 - The registering of citext is no longer required because Rails 4.2
   added support for it in rails/rails#12523.
 - Also Rails 4.2 has locked minitest version to 5.5.1 so removed
   locking it to lower version in test_helper.
  • Loading branch information
prathamesh-sonpatki committed Mar 22, 2015
1 parent 1e3e91f commit 3856c9f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -2,8 +2,8 @@ source "https://rubygems.org"

ruby "2.2.1"

gem 'activesupport', '~> 4.1.4'
gem 'activerecord', '~> 4.1.4'
gem 'activesupport', '~> 4.2.1'
gem 'activerecord', '~> 4.2.1'

gem 'bugsnag'
gem 'faraday'
Expand Down
32 changes: 16 additions & 16 deletions Gemfile.lock
@@ -1,24 +1,24 @@
GEM
remote: https://rubygems.org/
specs:
activemodel (4.1.6)
activesupport (= 4.1.6)
activemodel (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1)
activerecord (4.1.6)
activemodel (= 4.1.6)
activesupport (= 4.1.6)
arel (~> 5.0.0)
activesupport (4.1.6)
i18n (~> 0.6, >= 0.6.9)
activerecord (4.2.1)
activemodel (= 4.2.1)
activesupport (= 4.2.1)
arel (~> 6.0)
activesupport (4.2.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.6)
approvals (0.0.16)
nokogiri (~> 1.6)
thor (~> 0.18)
arel (5.0.1.20140414130214)
arel (6.0.0)
backports (3.6.3)
bootstrap-sass (3.3.0.1)
sass (~> 3.2)
Expand Down Expand Up @@ -71,8 +71,8 @@ GEM
httparty (0.13.1)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.6.11)
json (1.8.1)
i18n (0.7.0)
json (1.8.2)
kss (0.5.0)
launchy (2.4.2)
addressable (~> 2.3)
Expand All @@ -84,7 +84,7 @@ GEM
method_source (0.8.2)
mime-types (2.4.3)
mini_portile (0.6.0)
minitest (5.4.1)
minitest (5.5.1)
minitest-capybara (0.7.1)
capybara (~> 2.2)
minitest (~> 5.0)
Expand Down Expand Up @@ -154,7 +154,7 @@ GEM
term-ansicolor (1.3.0)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.4)
thread_safe (0.3.5)
tilt (1.4.1)
timecop (0.7.1)
timers (1.1.0)
Expand All @@ -171,8 +171,8 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord (~> 4.1.4)
activesupport (~> 4.1.4)
activerecord (= 4.2.1)
activesupport (= 4.2.1)
approvals
bootstrap-sass
bugsnag
Expand Down
1 change: 0 additions & 1 deletion lib/exercism.rb
Expand Up @@ -46,7 +46,6 @@

require 'db/connection'
DB::Connection.establish
require 'exercism/active_record_citext'

class Exercism
def self.root
Expand Down
4 changes: 0 additions & 4 deletions lib/exercism/active_record_citext.rb

This file was deleted.

1 change: 0 additions & 1 deletion test/test_helper.rb
Expand Up @@ -3,7 +3,6 @@
ENV['RACK_ENV'] = 'test'
require 'simplecov' if ENV['COVERAGE']

gem 'minitest', '=5.4.1'
require 'minitest/autorun'
require 'minitest/pride'
require 'pry'

0 comments on commit 3856c9f

Please sign in to comment.