Permalink
Browse files

Merge pull request #27 from thoughtbot/tc-update

Upgrade to Rails 4.2 and AWS SDK to v2
  • Loading branch information...
2 parents fb7bb63 + 51aca59 commit 3c1161765686b332bc385c1219cfe32cf18a4fa4 @tute tute committed May 9, 2016
View
15 Gemfile
@@ -1,23 +1,26 @@
source "https://rubygems.org"
-gem "rails", "~> 4.1.x"
+gem "rails", "~> 4.2.0"
-gem "aws-sdk", "< 2.0"
+gem "aws-sdk", "~> 2.3"
gem "coffee-rails"
gem "jquery-rails"
gem "paperclip"
gem "pg"
gem "sass-rails"
gem "uglifier"
+group :development do
+ gem "web-console", "~> 2.0"
+end
+
group :development, :test do
- gem "rspec-rails"
- gem "sqlite3"
- gem "launchy"
gem "factory_girl_rails"
+ gem "launchy"
+ gem "rspec-rails"
end
group :test do
gem "capybara"
- gem "shoulda-matchers"
+ gem "shoulda-matchers", ">= 3.0.0", require: false
end
View
@@ -1,166 +1,205 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.1.2)
- actionpack (= 4.1.2)
- actionview (= 4.1.2)
- mail (~> 2.5.4)
- actionpack (4.1.2)
- actionview (= 4.1.2)
- activesupport (= 4.1.2)
- rack (~> 1.5.2)
+ actionmailer (4.2.6)
+ actionpack (= 4.2.6)
+ actionview (= 4.2.6)
+ activejob (= 4.2.6)
+ mail (~> 2.5, >= 2.5.4)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (4.2.6)
+ actionview (= 4.2.6)
+ activesupport (= 4.2.6)
+ rack (~> 1.6)
rack-test (~> 0.6.2)
- actionview (4.1.2)
- activesupport (= 4.1.2)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ actionview (4.2.6)
+ activesupport (= 4.2.6)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.2)
- activesupport (= 4.1.2)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ activejob (4.2.6)
+ activesupport (= 4.2.6)
+ globalid (>= 0.3.0)
+ activemodel (4.2.6)
+ activesupport (= 4.2.6)
builder (~> 3.1)
- activerecord (4.1.2)
- activemodel (= 4.1.2)
- activesupport (= 4.1.2)
- arel (~> 5.0.0)
- activesupport (4.1.2)
- i18n (~> 0.6, >= 0.6.9)
+ activerecord (4.2.6)
+ activemodel (= 4.2.6)
+ activesupport (= 4.2.6)
+ arel (~> 6.0)
+ activesupport (4.2.6)
+ 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.5)
- arel (5.0.1.20140414130214)
- aws-sdk (1.34.0)
- json (~> 1.4)
- nokogiri (>= 1.4.4)
- uuidtools (~> 2.1)
+ addressable (2.4.0)
+ arel (6.0.3)
+ aws-sdk (2.3.0)
+ aws-sdk-resources (= 2.3.0)
+ aws-sdk-core (2.3.0)
+ jmespath (~> 1.0)
+ aws-sdk-resources (2.3.0)
+ aws-sdk-core (= 2.3.0)
+ binding_of_caller (0.7.2)
+ debug_inspector (>= 0.0.1)
builder (3.2.2)
- capybara (2.2.1)
+ capybara (2.7.0)
+ addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
climate_control (0.0.3)
activesupport (>= 3.0)
- cocaine (0.5.4)
+ cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
- coffee-rails (4.0.1)
+ coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0, < 5.0)
- coffee-script (2.2.0)
+ railties (>= 4.0.0, < 5.1.x)
+ coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.7.0)
+ coffee-script-source (1.10.0)
+ concurrent-ruby (1.0.1)
+ debug_inspector (0.0.2)
diff-lcs (1.2.5)
erubis (2.7.0)
- execjs (2.0.2)
- factory_girl (4.5.0)
+ execjs (2.6.0)
+ factory_girl (4.7.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.5.0)
- factory_girl (~> 4.5.0)
+ factory_girl_rails (4.7.0)
+ factory_girl (~> 4.7.0)
railties (>= 3.0.0)
- hike (1.2.3)
- i18n (0.6.9)
- jquery-rails (3.1.0)
+ globalid (0.3.6)
+ activesupport (>= 4.1.0)
+ i18n (0.7.0)
+ jmespath (1.2.4)
+ json_pure (>= 1.8.1)
+ jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.1)
- launchy (2.4.2)
+ json (1.8.3)
+ json_pure (1.8.3)
+ launchy (2.4.3)
addressable (~> 2.3)
- mail (2.5.4)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.25.1)
- mini_portile (0.5.2)
- minitest (5.3.5)
- multi_json (1.10.1)
- nokogiri (1.6.1)
- mini_portile (~> 0.5.0)
- paperclip (4.1.1)
- activemodel (>= 3.0.0)
- activesupport (>= 3.0.0)
- cocaine (~> 0.5.3)
+ loofah (2.0.3)
+ nokogiri (>= 1.5.9)
+ mail (2.6.4)
+ mime-types (>= 1.16, < 4)
+ mime-types (3.0)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0221)
+ mimemagic (0.3.0)
+ mini_portile2 (2.0.0)
+ minitest (5.8.4)
+ nokogiri (1.6.7.2)
+ mini_portile2 (~> 2.0.0.rc2)
+ paperclip (4.3.6)
+ activemodel (>= 3.2.0)
+ activesupport (>= 3.2.0)
+ cocaine (~> 0.5.5)
mime-types
- pg (0.17.1)
- polyglot (0.3.5)
- rack (1.5.2)
- rack-test (0.6.2)
+ mimemagic (= 0.3.0)
+ pg (0.18.4)
+ rack (1.6.4)
+ rack-test (0.6.3)
rack (>= 1.0)
- rails (4.1.2)
- actionmailer (= 4.1.2)
- actionpack (= 4.1.2)
- actionview (= 4.1.2)
- activemodel (= 4.1.2)
- activerecord (= 4.1.2)
- activesupport (= 4.1.2)
+ rails (4.2.6)
+ actionmailer (= 4.2.6)
+ actionpack (= 4.2.6)
+ actionview (= 4.2.6)
+ activejob (= 4.2.6)
+ activemodel (= 4.2.6)
+ activerecord (= 4.2.6)
+ activesupport (= 4.2.6)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.2)
- sprockets-rails (~> 2.0)
- railties (4.1.2)
- actionpack (= 4.1.2)
- activesupport (= 4.1.2)
+ railties (= 4.2.6)
+ sprockets-rails
+ rails-deprecated_sanitizer (1.0.3)
+ activesupport (>= 4.2.0.alpha)
+ rails-dom-testing (1.0.7)
+ activesupport (>= 4.2.0.beta, < 5.0)
+ nokogiri (~> 1.6.0)
+ rails-deprecated_sanitizer (>= 1.0.1)
+ rails-html-sanitizer (1.0.3)
+ loofah (~> 2.0)
+ railties (4.2.6)
+ actionpack (= 4.2.6)
+ activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.3.2)
- rspec-core (2.14.7)
- rspec-expectations (2.14.5)
- diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.14.5)
- rspec-rails (2.14.1)
- actionpack (>= 3.0)
- activemodel (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec-core (~> 2.14.0)
- rspec-expectations (~> 2.14.0)
- rspec-mocks (~> 2.14.0)
- sass (3.2.14)
- sass-rails (4.0.1)
+ rake (11.1.2)
+ rspec-core (3.4.4)
+ rspec-support (~> 3.4.0)
+ rspec-expectations (3.4.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.4.0)
+ rspec-mocks (3.4.1)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.4.0)
+ rspec-rails (3.4.2)
+ actionpack (>= 3.0, < 4.3)
+ activesupport (>= 3.0, < 4.3)
+ railties (>= 3.0, < 4.3)
+ rspec-core (~> 3.4.0)
+ rspec-expectations (~> 3.4.0)
+ rspec-mocks (~> 3.4.0)
+ rspec-support (~> 3.4.0)
+ rspec-support (3.4.1)
+ sass (3.4.22)
+ sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
- sass (>= 3.1.10)
- sprockets-rails (~> 2.0.0)
- shoulda-matchers (2.6.1)
- activesupport (>= 3.0.0)
- sprockets (2.12.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)
- sqlite3 (1.3.10)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
+ shoulda-matchers (3.1.1)
+ activesupport (>= 4.0.0)
+ sprockets (3.6.0)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.0.4)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
thor (0.19.1)
- thread_safe (0.3.4)
- tilt (1.4.1)
- treetop (1.4.15)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (1.2.1)
+ thread_safe (0.3.5)
+ tilt (2.0.2)
+ tzinfo (1.2.2)
thread_safe (~> 0.1)
- uglifier (2.4.0)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
- uuidtools (2.1.4)
+ uglifier (3.0.0)
+ execjs (>= 0.3.0, < 3)
+ web-console (2.2.1)
+ activemodel (>= 4.0)
+ binding_of_caller (>= 0.7.2)
+ railties (>= 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
xpath (2.0.0)
nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
- aws-sdk (< 2.0)
+ aws-sdk (~> 2.3)
capybara
coffee-rails
factory_girl_rails
jquery-rails
launchy
paperclip
pg
- rails (~> 4.1.x)
+ rails (~> 4.2.0)
rspec-rails
sass-rails
- shoulda-matchers
- sqlite3
+ shoulda-matchers (>= 3.0.0)
uglifier
+ web-console (~> 2.0)
+
+BUNDLED WITH
+ 1.11.2
View
@@ -8,16 +8,6 @@
module PaperclipDemo
class Application < Rails::Application
- # Settings in config/environments/* take precedence over those specified here.
- # Application configuration should go into files in config/initializers
- # -- all .rb files in that directory are automatically loaded.
-
- # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
- # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
- # config.time_zone = 'Central Time (US & Canada)'
-
- # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
- # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
- # config.i18n.default_locale = :de
+ config.active_record.raise_in_transactional_callbacks = true
end
end
Oops, something went wrong.

0 comments on commit 3c11617

Please sign in to comment.