Skip to content
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.

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

Rails 4 upgrade #12

Merged
merged 6 commits into from Feb 8, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .rspec
@@ -1,4 +1,3 @@
--debug
--colour
--format documentation
--drb
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.1.0
2.0.0-p353
26 changes: 16 additions & 10 deletions Gemfile
@@ -1,35 +1,41 @@
source "http://rubygems.org"
source "https://rubygems.org"

gem "rails"
gem "rails", "4.0.2"

# Use PostgreSQL as the database for Active Record
gem "pg", :require => "pg"

# Compressor of JavaScript assets
gem "uglifier", ">= 1.3.0"

# Use CoffeeScript for .js.coffee assets and views
gem "coffee-rails", "~> 4.0.0"

# Use jQuery as the JavaScript library
gem "jquery-rails"
gem "devise"

# User authentication
gem "devise", "3.2.2"

gem "omniauth-facebook"
gem "kaminari"
gem "carrierwave"
gem "meta_search"
gem "ransack"
gem "dynamic_form"
gem "heroku"
gem "coffee-rails"
gem "less-rails"
gem "twitter-bootstrap-rails"

group :assets do
gem "therubyracer", :platform => :ruby
end

group :test, :development do
gem "rspec-rails"
gem "spork-rails"
gem "debugger"
gem "awesome_print"
end

group :development do
gem "chronic"
gem "admin_view"
#gem "admin_view"
end

group :test do
Expand Down
184 changes: 74 additions & 110 deletions Gemfile.lock
@@ -1,42 +1,36 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
actionmailer (3.2.11)
actionpack (= 3.2.11)
mail (~> 2.4.4)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
actionmailer (4.0.2)
actionpack (= 4.0.2)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.5)
admin_view (0.2.0)
kaminari (>= 0.12)
meta_search (>= 1.0)
rails (>= 3.0)
arel (3.0.2)
arel (4.0.1)
atomic (1.1.14)
awesome_print (1.2.0)
bcrypt-ruby (3.0.1)
builder (3.0.4)
bcrypt-ruby (3.1.2)
builder (3.1.4)
capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -49,15 +43,14 @@ GEM
childprocess (0.4.0)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
coffee-rails (3.2.2)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.4.0)
coffee-script-source (1.7.0)
columnize (0.3.6)
commonjs (0.2.6)
cucumber (1.3.10)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
Expand All @@ -77,19 +70,19 @@ GEM
debugger-ruby_core_source (~> 1.3.1)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.1)
devise (2.1.2)
devise (3.2.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
dynamic_form (1.1.4)
email_spec (1.5.0)
launchy (~> 2.1)
mail (~> 2.2)
erubis (2.7.0)
eventmachine (1.0.3)
excon (0.16.8)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.3.0)
Expand All @@ -103,18 +96,9 @@ GEM
gherkin (2.12.2)
multi_json (~> 1.3)
hashie (1.2.0)
heroku (2.33.0)
heroku-api (~> 0.3.5)
launchy (>= 0.3.2)
netrc (~> 0.7.7)
rest-client (~> 1.6.1)
rubyzip
heroku-api (0.3.6)
excon (~> 0.16.7)
hike (1.2.3)
httpauth (0.2.0)
i18n (0.6.9)
journey (1.0.4)
jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
Expand All @@ -126,27 +110,16 @@ GEM
activesupport (>= 3.0.0)
launchy (2.4.2)
addressable (~> 2.3)
less (2.2.2)
commonjs (~> 0.2.6)
less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
libv8 (3.3.10.4)
mail (2.4.4)
i18n (>= 0.4.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_search (1.1.3)
actionpack (~> 3.1)
activerecord (~> 3.1)
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
mime-types (1.25.1)
mini_portile (0.5.2)
minitest (4.7.5)
multi_json (1.8.4)
multi_test (0.0.3)
multipart-post (1.1.5)
netrc (0.7.7)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oauth2 (0.8.0)
Expand All @@ -163,38 +136,32 @@ GEM
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
orm_adapter (0.4.0)
orm_adapter (0.5.0)
pg (0.17.1)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyamorous (0.6.4)
activerecord (>= 3.0)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
bundler (~> 1.0)
railties (= 3.2.11)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
thor (>= 0.18.1, < 2.0)
rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
ransack (1.1.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
polyamorous (~> 0.6.0)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
Expand All @@ -219,32 +186,33 @@ GEM
shoulda-context (1.1.6)
shoulda-matchers (2.5.0)
activesupport (>= 3.0.0)
spork (1.0.0rc3)
spork-rails (3.2.0)
rails (>= 3.0.0, < 3.3.0)
spork (>= 1.0rc0)
sprockets (2.2.2)
sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
thin (1.6.1)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
twitter-bootstrap-rails (2.1.6)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
tzinfo (0.3.35)
warden (1.2.1)
tzinfo (0.3.38)
uglifier (2.4.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
rack (>= 1.0)
websocket (1.0.7)
xpath (2.0.0)
Expand All @@ -254,31 +222,27 @@ PLATFORMS
ruby

DEPENDENCIES
admin_view
awesome_print
capybara
carrierwave
chronic
coffee-rails
coffee-rails (~> 4.0.0)
cucumber-rails
database_cleaner
debugger
devise
devise (= 3.2.2)
dynamic_form
email_spec
factory_girl_rails
heroku
jquery-rails
kaminari
less-rails
meta_search
omniauth-facebook
pg
rails
rails (= 4.0.2)
ransack
rspec-rails
selenium-webdriver
shoulda
spork-rails
therubyracer
thin
twitter-bootstrap-rails
uglifier (>= 1.3.0)
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2011 Rendered Text
Copyright (c) 2011-2014 Rendered Text

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down