Skip to content

Commit

Permalink
bump rails to 4.1 now that active_hash has a working 4.1 version
Browse files Browse the repository at this point in the history 
Also bump Compass to 1.0, and all the other
`bundle update`-able things.
  • Loading branch information
@tjgrathwell
tjgrathwell committed Sep 4, 2014
1 parent 179fb16 commit 48ba5e4
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 47 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Expand Up @@ -5,7 +5,7 @@ ruby '2.1.2'

gem 'dotenv-rails', groups: [:development, :test]

gem 'rails', '4.0.8'
gem 'rails', '4.1.5'
gem 'devise', '~> 3.3.0'
gem 'thin'
gem 'jquery-rails'
Expand Down
95 changes: 50 additions & 45 deletions Gemfile.lock
View file
Expand Up @@ -2,38 +2,40 @@ GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
actionmailer (4.0.8)
actionpack (= 4.0.8)
actionmailer (4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
mail (~> 2.5.4)
actionpack (4.0.8)
activesupport (= 4.0.8)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.5)
actionview (= 4.1.5)
activesupport (= 4.1.5)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
active_hash (1.3.0)
actionview (4.1.5)
activesupport (= 4.1.5)
builder (~> 3.1)
erubis (~> 2.7.0)
active_hash (1.4.0)
activesupport (>= 2.2.2)
activemodel (4.0.8)
activesupport (= 4.0.8)
builder (~> 3.1.0)
activerecord (4.0.8)
activemodel (= 4.0.8)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.8)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activemodel (4.1.5)
activesupport (= 4.1.5)
builder (~> 3.1)
activerecord (4.1.5)
activemodel (= 4.1.5)
activesupport (= 4.1.5)
arel (~> 5.0.0)
activeresource (4.0.0)
activemodel (~> 4.0)
activesupport (~> 4.0)
rails-observers (~> 0.1.1)
activesupport (4.0.8)
activesupport (4.1.5)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
tzinfo (~> 1.1)
addressable (2.3.6)
arel (4.0.2)
arel (5.0.1.20140414130214)
awesome_print (1.2.0)
backbone-on-rails (1.1.1.0)
actionmailer
Expand All @@ -48,7 +50,7 @@ GEM
bootstrap-sass-rails (2.3.2.1)
railties (>= 3.1.0)
sass-rails (>= 3.1.0)
builder (3.1.4)
builder (3.2.2)
bullet (4.13.1)
activesupport (>= 3.0.0)
uniform_notifier (>= 1.6.0)
Expand All @@ -72,7 +74,7 @@ GEM
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
coffee-script-source (1.8.0)
compass (0.12.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
Expand Down Expand Up @@ -115,7 +117,7 @@ GEM
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.3)
font-awesome-rails (4.1.0.0)
font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0)
formatador (0.2.5)
fssm (0.2.10)
Expand All @@ -136,7 +138,7 @@ GEM
multi_json
sprockets (>= 2.0.3)
tilt
hashie (3.2.0)
hashie (3.3.1)
heroku-api (0.3.19)
excon (~> 0.38)
multi_json (~> 1.8)
Expand All @@ -156,12 +158,12 @@ GEM
phantomjs
rack (>= 1.2.1)
rake
jasmine-core (2.0.1)
jasmine-core (2.0.2)
jasmine-jquery-rails (2.0.3)
jquery-datatables-rails (2.2.2)
jquery-datatables-rails (2.2.3)
jquery-rails
sass-rails
jquery-rails (3.1.1)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.0)
Expand All @@ -183,14 +185,14 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.0)
minitest (4.7.5)
minitest (5.4.1)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
nested_form (0.3.2)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
nokogumbo (1.1.9)
nokogumbo (1.1.12)
nokogiri
oauth (0.4.7)
oauth2 (1.0.0)
Expand Down Expand Up @@ -242,13 +244,15 @@ GEM
rack (~> 1.0)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.8)
actionmailer (= 4.0.8)
actionpack (= 4.0.8)
activerecord (= 4.0.8)
activesupport (= 4.0.8)
rails (4.1.5)
actionmailer (= 4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
activemodel (= 4.1.5)
activerecord (= 4.1.5)
activesupport (= 4.1.5)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.8)
railties (= 4.1.5)
sprockets-rails (~> 2.0)
rails-assets-sinonjs (1.10.2)
rails-observers (0.1.2)
Expand All @@ -258,9 +262,9 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.0.8)
actionpack (= 4.0.8)
activesupport (= 4.0.8)
railties (4.1.5)
actionpack (= 4.1.5)
activesupport (= 4.1.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
Expand Down Expand Up @@ -290,23 +294,23 @@ GEM
rspec-support (~> 3.0.0)
rspec-support (3.0.4)
safe_yaml (1.0.3)
sanitize (3.0.0)
sanitize (3.0.2)
crass (~> 0.2.0)
nokogiri (>= 1.4.4)
nokogumbo (= 1.1.9)
nokogumbo (= 1.1.12)
sass (3.2.19)
sass-rails (4.0.2)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0.0)
select2-rails (3.5.9)
select2-rails (3.5.9.1)
thor (~> 0.14)
sentry-raven (0.9.4)
faraday (>= 0.7.6)
hashie (>= 1.1.0)
uuidtools
shoulda-matchers (2.6.2)
shoulda-matchers (2.7.0)
activesupport (>= 3.0.0)
simple_form (3.0.2)
actionpack (~> 4.0)
Expand Down Expand Up @@ -334,7 +338,8 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.41)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
Expand Down Expand Up @@ -391,7 +396,7 @@ DEPENDENCIES
poltergeist
quiet_assets
rack-canonical-host
rails (= 4.0.8)
rails (= 4.1.5)
rails-assets-sinonjs
rails_12factor
rb-fsevent
Expand Down
2 changes: 1 addition & 1 deletion spec/models/rsvp_spec.rb
View file
Expand Up @@ -43,7 +43,7 @@

subject.teaching = true
subject.should have(1).errors_on(:class_level)
subject.should ensure_inclusion_of(:class_level).in_range(0..5)
subject.should validate_inclusion_of(:class_level).in_range(0..5)
end

it "should only require teaching_experience if teaching or TAing" do
Expand Down

0 comments on commit 48ba5e4

Please sign in to comment.