Skip to content
This repository has been archived by the owner on Dec 2, 2020. It is now read-only.

Upgrade Rails and Ruby #75

Merged
merged 1 commit into from
Jun 25, 2015
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.2.2
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ruby "2.0.0"
ruby "2.2.2"
source "https://rubygems.org"

gem "dotenv", "0.4.0"
gem "erubis", "2.7.0"
gem "jquery-rails", "2.1.4"
gem "omniauth-github", "1.1.0"
gem "pg", "0.14.1"
gem "rails", "~> 3.2.21"
gem "unicorn", "4.5.0"
gem "omniauth-github", "1.1.2"
gem "pg", "0.18.2"
gem "rails", "~> 3.2.22"
gem "unicorn", "4.9.0"

group :assets do
gem "coffee-rails", "3.2.2"
Expand Down
158 changes: 84 additions & 74 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,139 +1,143 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.21)
actionpack (= 3.2.21)
actionmailer (3.2.22)
actionpack (= 3.2.22)
mail (~> 2.5.4)
actionpack (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
actionpack (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.21)
activesupport (= 3.2.21)
activemodel (3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
activerecord (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
activerecord (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
activesupport (3.2.21)
activeresource (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activesupport (3.2.22)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
addressable (2.3.8)
arel (3.0.3)
builder (3.0.4)
coderay (1.1.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source (1.9.1.1)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
dotenv (0.4.0)
erubis (2.7.0)
excon (0.31.0)
execjs (2.0.2)
faraday (0.9.0)
excon (0.45.3)
execjs (2.5.2)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
hashie (2.0.5)
heroku (3.3.0)
heroku-api (~> 0.3.17)
hashie (3.4.2)
heroku (3.38.3)
heroku-api (>= 0.3.19)
launchy (>= 0.3.2)
netrc (~> 0.7.7)
rest-client (~> 1.6.1)
rubyzip
heroku-api (0.3.17)
excon (~> 0.27)
multi_json (~> 1.8.2)
multi_json (>= 1.10)
netrc (>= 0.10.0)
rest-client (>= 1.6.0)
rubyzip (>= 0.9.9)
heroku-api (0.3.23)
excon (~> 0.44)
multi_json (~> 1.8)
hike (1.2.3)
i18n (0.6.11)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
journey (1.0.4)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
jwt (0.1.11)
multi_json (>= 1.5)
kgio (2.9.2)
launchy (2.4.2)
json (1.8.3)
jwt (1.5.0)
kgio (2.9.3)
launchy (2.4.3)
addressable (~> 2.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.25.1)
multi_json (1.8.4)
multi_json (1.11.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
netrc (0.7.7)
oauth2 (0.9.3)
netrc (0.10.3)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
jwt (~> 0.1.8)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.2.1)
hashie (>= 1.2, < 3)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-github (1.1.0)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.1.2)
faraday (>= 0.8, < 0.10)
multi_json (~> 1.3)
oauth2 (~> 0.9.3)
omniauth-oauth2 (1.3.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pg (0.14.1)
pg (0.18.2)
polyglot (0.3.5)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.4.5)
rack (1.4.7)
rack-cache (1.2.1)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.21)
actionmailer (= 3.2.21)
actionpack (= 3.2.21)
activerecord (= 3.2.21)
activeresource (= 3.2.21)
activesupport (= 3.2.21)
rails (3.2.22)
actionmailer (= 3.2.22)
actionpack (= 3.2.22)
activerecord (= 3.2.22)
activeresource (= 3.2.22)
activesupport (= 3.2.22)
bundler (~> 1.0)
railties (= 3.2.21)
railties (3.2.21)
actionpack (= 3.2.21)
activesupport (= 3.2.21)
railties (= 3.2.22)
railties (3.2.22)
actionpack (= 3.2.22)
activesupport (= 3.2.22)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.13.0)
rake (10.3.2)
rake (10.4.2)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rubyzip (1.1.0)
sass (3.2.14)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rubyzip (1.1.7)
sass (3.4.14)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
slop (3.4.7)
slop (3.6.0)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
Expand All @@ -144,11 +148,14 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.42)
tzinfo (0.3.44)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.5.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
unicorn (4.9.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
Expand All @@ -162,10 +169,13 @@ DEPENDENCIES
erubis (= 2.7.0)
heroku
jquery-rails (= 2.1.4)
omniauth-github (= 1.1.0)
pg (= 0.14.1)
omniauth-github (= 1.1.2)
pg (= 0.18.2)
pry
rails (~> 3.2.21)
rails (~> 3.2.22)
sass-rails (= 3.2.5)
uglifier (= 1.3.0)
unicorn (= 4.5.0)
unicorn (= 4.9.0)

BUNDLED WITH
1.10.3
Binary file removed vendor/cache/actionmailer-3.2.21.gem
Binary file not shown.
Binary file added vendor/cache/actionmailer-3.2.22.gem
Binary file not shown.
Binary file removed vendor/cache/actionpack-3.2.21.gem
Binary file not shown.
Binary file added vendor/cache/actionpack-3.2.22.gem
Binary file not shown.
Binary file removed vendor/cache/activemodel-3.2.21.gem
Binary file not shown.
Binary file added vendor/cache/activemodel-3.2.22.gem
Binary file not shown.
Binary file removed vendor/cache/activerecord-3.2.21.gem
Binary file not shown.
Binary file added vendor/cache/activerecord-3.2.22.gem
Binary file not shown.
Binary file removed vendor/cache/activeresource-3.2.21.gem
Binary file not shown.
Binary file added vendor/cache/activeresource-3.2.22.gem
Binary file not shown.
Binary file removed vendor/cache/activesupport-3.2.21.gem
Binary file not shown.
Binary file added vendor/cache/activesupport-3.2.22.gem
Binary file not shown.
Binary file removed vendor/cache/addressable-2.3.5.gem
Binary file not shown.
Binary file added vendor/cache/addressable-2.3.8.gem
Binary file not shown.
Binary file removed vendor/cache/coffee-script-2.2.0.gem
Binary file not shown.
Binary file added vendor/cache/coffee-script-2.4.1.gem
Binary file not shown.
Binary file removed vendor/cache/coffee-script-source-1.7.0.gem
Binary file not shown.
Binary file added vendor/cache/coffee-script-source-1.9.1.1.gem
Binary file not shown.
Binary file added vendor/cache/domain_name-0.5.24.gem
Binary file not shown.
Binary file removed vendor/cache/excon-0.31.0.gem
Binary file not shown.
Binary file added vendor/cache/excon-0.45.3.gem
Binary file not shown.
Binary file removed vendor/cache/execjs-2.0.2.gem
Binary file not shown.
Binary file added vendor/cache/execjs-2.5.2.gem
Binary file not shown.
Binary file removed vendor/cache/faraday-0.9.0.gem
Binary file not shown.
Binary file added vendor/cache/faraday-0.9.1.gem
Binary file not shown.
Binary file removed vendor/cache/hashie-2.0.5.gem
Binary file not shown.
Binary file added vendor/cache/hashie-3.4.2.gem
Binary file not shown.
Binary file removed vendor/cache/heroku-3.3.0.gem
Binary file not shown.
Binary file added vendor/cache/heroku-3.38.3.gem
Binary file not shown.
Binary file removed vendor/cache/heroku-api-0.3.17.gem
Binary file not shown.
Binary file added vendor/cache/heroku-api-0.3.23.gem
Binary file not shown.
Binary file added vendor/cache/http-cookie-1.0.2.gem
Binary file not shown.
Binary file removed vendor/cache/i18n-0.6.11.gem
Binary file not shown.
Binary file added vendor/cache/i18n-0.7.0.gem
Binary file not shown.
Binary file removed vendor/cache/json-1.8.1.gem
Binary file not shown.
Binary file added vendor/cache/json-1.8.3.gem
Binary file not shown.
Binary file removed vendor/cache/jwt-0.1.11.gem
Binary file not shown.
Binary file added vendor/cache/jwt-1.5.0.gem
Binary file not shown.
Binary file removed vendor/cache/kgio-2.9.2.gem
Binary file not shown.
Binary file added vendor/cache/kgio-2.9.3.gem
Binary file not shown.
Binary file removed vendor/cache/launchy-2.4.2.gem
Binary file not shown.
Binary file added vendor/cache/launchy-2.4.3.gem
Binary file not shown.
Binary file added vendor/cache/multi_json-1.11.1.gem
Binary file not shown.
Binary file removed vendor/cache/multi_json-1.8.4.gem
Binary file not shown.
Binary file added vendor/cache/netrc-0.10.3.gem
Binary file not shown.
Binary file removed vendor/cache/netrc-0.7.7.gem
Binary file not shown.
Binary file removed vendor/cache/oauth2-0.9.3.gem
Binary file not shown.
Binary file added vendor/cache/oauth2-1.0.0.gem
Binary file not shown.
Binary file removed vendor/cache/omniauth-1.2.1.gem
Binary file not shown.
Binary file added vendor/cache/omniauth-1.2.2.gem
Binary file not shown.
Binary file removed vendor/cache/omniauth-github-1.1.0.gem
Binary file not shown.
Binary file added vendor/cache/omniauth-github-1.1.2.gem
Binary file not shown.
Binary file removed vendor/cache/omniauth-oauth2-1.1.2.gem
Binary file not shown.
Binary file added vendor/cache/omniauth-oauth2-1.3.0.gem
Binary file not shown.
Binary file removed vendor/cache/pg-0.14.1.gem
Binary file not shown.
Binary file added vendor/cache/pg-0.18.2.gem
Binary file not shown.
Binary file added vendor/cache/pry-0.10.1.gem
Binary file not shown.
Binary file removed vendor/cache/pry-0.9.12.6.gem
Binary file not shown.
Binary file removed vendor/cache/rack-1.4.5.gem
Binary file not shown.
Binary file added vendor/cache/rack-1.4.7.gem
Binary file not shown.
Binary file removed vendor/cache/rack-test-0.6.2.gem
Binary file not shown.
Binary file added vendor/cache/rack-test-0.6.3.gem
Binary file not shown.
Binary file not shown.
Binary file removed vendor/cache/railties-3.2.21.gem
Binary file not shown.
Binary file added vendor/cache/railties-3.2.22.gem
Binary file not shown.
Binary file removed vendor/cache/rake-10.3.2.gem
Binary file not shown.
Binary file added vendor/cache/rake-10.4.2.gem
Binary file not shown.
Binary file removed vendor/cache/rest-client-1.6.7.gem
Binary file not shown.
Binary file added vendor/cache/rest-client-1.8.0.gem
Binary file not shown.
Binary file removed vendor/cache/rubyzip-1.1.0.gem
Binary file not shown.
Binary file added vendor/cache/rubyzip-1.1.7.gem
Binary file not shown.
Binary file removed vendor/cache/sass-3.2.14.gem
Binary file not shown.
Binary file added vendor/cache/sass-3.4.14.gem
Binary file not shown.
Binary file removed vendor/cache/slop-3.4.7.gem
Binary file not shown.
Binary file added vendor/cache/slop-3.6.0.gem
Binary file not shown.
Binary file removed vendor/cache/tzinfo-0.3.42.gem
Binary file not shown.
Binary file added vendor/cache/tzinfo-0.3.44.gem
Binary file not shown.
Binary file added vendor/cache/unf-0.1.4.gem
Binary file not shown.
Binary file added vendor/cache/unf_ext-0.0.7.1.gem
Binary file not shown.
Binary file removed vendor/cache/unicorn-4.5.0.gem
Binary file not shown.
Binary file added vendor/cache/unicorn-4.9.0.gem
Binary file not shown.