Skip to content

Commit

Permalink
update rails 4.2 and ruby 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ninetwentyfour
ninetwentyfour committed Jan 11, 2015
1 parent 79bb6b7 commit 00e2ab6
Show file tree
Hide file tree
Showing 15 changed files with 358 additions and 288 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: ruby
bundler_args: --without development production
cache: bundler
rvm:
- 2.1.5
- 2.2.0
env:
global:
- secure: "bkydnmBQRrAPqAUvtjW4vdj9NteFo9FAYiRlEMJGnqG8dZ6SlseQihDKeBUr\n1aSpX5XP7h8AoxCJolw/K2J4tTYjNAh+cYKP2kJQG/SkIZXKfFJbNzl7zULt\nWareyiHeocI11MU2zaaJpZjwSLiw3G/E9oIy2D3X921SvY7h1L0="
Expand Down
20 changes: 11 additions & 9 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'http://rubygems.org'
ruby "2.1.5"
ruby "2.2.0"

# load ENV vars for testing and dev
gem 'dotenv-rails', :groups => [:development, :test]

gem 'rails', '4.1.8'
gem 'rails', '4.2.0'

# Gems used in all environments
# gem 'mysql2'
Expand All @@ -17,7 +17,7 @@ gem 'cancan'
gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
gem 'will_paginate'
gem 'will_paginate-bootstrap'
gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'rails-4.1'
gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'rails-4.2'
gem 'juggernaut'
gem 'gravatar_image_tag'
gem "spreadsheet"
Expand Down Expand Up @@ -67,7 +67,7 @@ group :production do
end

# Gems used for production and development
group :production, :development do
# group :production, :development do
gem 'nokogiri'
gem 'mechanize'
gem 'oauth'
Expand All @@ -94,7 +94,7 @@ group :production, :development do
gem 'uglifier'
gem 'yui-compressor'
gem 'closure-compiler', '1.1.10'
end
# end

group :test, :development do
gem "rspec-rails"
Expand All @@ -105,14 +105,16 @@ end
# Gems used only for testing
group :test do
gem "factory_girl_rails"
gem "capybara", ">= 2.2.0"
gem "capybara"
# gem "capybara-webkit"
gem 'shoulda-matchers'
gem 'cucumber-rails', :require => false
# gem 'cucumber-rails', :require => false
gem 'database_cleaner'
gem 'launchy'
# gem 'launchy'
gem 'email_spec'
gem 'poltergeist'
gem 'mocha', "~> 0.13.2", :require => false
gem 'capybara-email'
# gem 'mocha', "~> 0.13.2", :require => false
gem 'webmock'
gem 'vcr'
gem 'simplecov', :require => false
Expand Down
158 changes: 84 additions & 74 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ GIT

GIT
remote: git://github.com/activerecord-hackery/ransack.git
revision: 742425ade4bb66db573dc13bf436a8f3c87b733b
branch: rails-4.1
revision: 6d31b6585d0700337fb13df983fc13a34a5e2074
branch: rails-4.2
specs:
ransack (1.2.4)
actionpack (>= 4.0)
activerecord (>= 4.0)
activesupport (>= 4.0)
actionpack (= 4.2)
activerecord (= 4.2)
activesupport (= 4.2)
i18n
polyamorous (~> 1.1)

Expand Down Expand Up @@ -60,37 +60,46 @@ GIT
GEM
remote: http://rubygems.org/
specs:
actionmailer (4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
actionmailer (4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8)
actionview (= 4.1.8)
activesupport (= 4.1.8)
rack (~> 1.5.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0)
actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
rack-test (~> 0.6.2)
actionview (4.1.8)
activesupport (= 4.1.8)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.8)
activesupport (= 4.1.8)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0)
activesupport (= 4.2.0)
globalid (>= 0.3.0)
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
activerecord (4.1.8)
activemodel (= 4.1.8)
activesupport (= 4.1.8)
arel (~> 5.0.0)
activesupport (4.1.8)
i18n (~> 0.6, >= 0.6.9)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activesupport (4.2.0)
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)
airbrake (4.1.0)
builder
multi_json
arel (5.0.1.20140414130214)
arel (6.0.0)
asset_sync (1.1.0)
activemodel
fog (>= 1.8.0)
Expand All @@ -100,20 +109,23 @@ GEM
aws-sdk-v1 (1.53.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
bcrypt (3.1.7)
bcrypt (3.1.9)
bitly (0.10.1)
httparty (>= 0.7.6)
multi_json (~> 1.3)
oauth2 (>= 0.5.0, < 0.10)
buftok (0.2.0)
builder (3.2.2)
cancan (1.6.10)
capybara (2.4.1)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-email (2.4.0)
capybara (~> 2.4)
mail
chronic (0.10.2)
climate_control (0.0.3)
activesupport (>= 3.0)
Expand All @@ -140,24 +152,13 @@ GEM
crack (0.4.2)
safe_yaml (~> 1.0.0)
crass (0.2.1)
cucumber (1.3.17)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.1)
cucumber-rails (1.4.1)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 2)
mime-types (~> 1.16)
nokogiri (~> 1.5)
rails (>= 3, < 5)
dalli (2.7.2)
database_cleaner (1.3.0)
devise (3.3.0)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
Expand Down Expand Up @@ -208,8 +209,8 @@ GEM
fog-core
fog-json
formatador (0.2.5)
gherkin (2.12.2)
multi_json (~> 1.3)
globalid (0.3.0)
activesupport (>= 4.1.0)
gravatar_image_tag (1.2.0)
heroku (1.6.3)
json (>= 1.1.0)
Expand All @@ -225,7 +226,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.4.0)
i18n (0.6.11)
i18n (0.7.0)
inflecto (0.0.2)
ipaddress (0.8.0)
jbuilder (2.1.3)
Expand All @@ -234,7 +235,7 @@ GEM
jquery-rails (2.0.1)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.8.1)
json (1.8.2)
juggernaut (2.1.1)
redis
jwt (1.0.0)
Expand All @@ -249,6 +250,8 @@ GEM
libxml-ruby (2.7.0)
libxml-xmlrpc (0.1.5)
libxml-ruby (> 0.0.0)
loofah (2.0.1)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mechanize (2.7.2)
Expand All @@ -262,14 +265,10 @@ GEM
webrobots (>= 0.0.9, < 0.2)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
metaclass (0.0.4)
mime-types (1.25.1)
mini_portile (0.6.0)
minitest (5.4.3)
mocha (0.13.3)
metaclass (~> 0.0.1)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.10.1)
multi_test (0.1.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
naught (1.0.0)
Expand All @@ -280,8 +279,8 @@ GEM
net-ssh (2.9.1)
netrc (0.7.7)
newrelic_rpm (3.9.4.245)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
nokogumbo (1.1.12)
nokogiri
ntlm-http (0.1.1)
Expand Down Expand Up @@ -311,39 +310,50 @@ GEM
activerecord (>= 3.0)
i18n (>= 0.5.0)
railties (>= 3.0.0)
puma (2.9.1)
puma (2.10.2)
rack (>= 1.1, < 2.0)
rack (1.5.2)
rack (1.6.0)
rack-attack (4.1.1)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.8)
actionmailer (= 4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
activemodel (= 4.1.8)
activerecord (= 4.1.8)
activesupport (= 4.1.8)
rails (4.2.0)
actionmailer (= 4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
activemodel (= 4.2.0)
activerecord (= 4.2.0)
activesupport (= 4.2.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8)
sprockets-rails (~> 2.0)
railties (= 4.2.0)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.5)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.1.8)
actionpack (= 4.1.8)
activesupport (= 4.1.8)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.0)
rake (10.4.2)
redcarpet (3.1.2)
redis (3.1.0)
ref (1.0.5)
responders (2.0.2)
railties (>= 4.2.0.alpha, < 5)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
Expand Down Expand Up @@ -405,7 +415,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.1)
sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand Down Expand Up @@ -447,7 +457,9 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
webrobots (0.1.1)
websocket-driver (0.3.4)
websocket-driver (0.5.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.1)
will_paginate (3.0.7)
will_paginate-bootstrap (1.0.1)
will_paginate (>= 3.0.3)
Expand All @@ -465,14 +477,14 @@ DEPENDENCIES
best_in_place!
bitly
cancan
capybara (>= 2.2.0)
capybara
capybara-email
chronic
client_side_validations!
closure-compiler (= 1.1.10)
coffee-rails
comma
coveralls
cucumber-rails
dalli
database_cleaner
devise
Expand All @@ -487,11 +499,9 @@ DEPENDENCIES
jquery-rails (= 2.0.1)
json
juggernaut
launchy
less-rails
libxml-xmlrpc
mechanize
mocha (~> 0.13.2)
newrelic_rpm
nokogiri
oauth
Expand All @@ -507,7 +517,7 @@ DEPENDENCIES
public_activity
puma
rack-attack
rails (= 4.1.8)
rails (= 4.2.0)
rails-observers
rails_12factor
ransack!
Expand Down
Loading

0 comments on commit 00e2ab6

Please sign in to comment.