aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-20 12:12:58 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-20 12:12:58 -0500
commitc2a61cc9220aaec0a1aeac7452da2ca80250e92b (patch)
treeceb34b5ea9b8e35c9c32da9d79f4797a89bcd9db /Gemfile
parent1966c188cfb06b39a47082e2f6c6e33a43668ae5 (diff)
parent32331b19e1da8bdab3c9f6d1666ac2d3108e5042 (diff)
downloadrails-c2a61cc9220aaec0a1aeac7452da2ca80250e92b.tar.gz
rails-c2a61cc9220aaec0a1aeac7452da2ca80250e92b.tar.bz2
rails-c2a61cc9220aaec0a1aeac7452da2ca80250e92b.zip
Merge branch 'master' into variants
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile22
1 files changed, 17 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index c4ecf50bbe..adc1e320e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,25 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+git_source(:github) { |repo_path| "https://github.com/#{repo_path}.git" }
gemspec
-gem 'rake'
-gem 'byebug'
+gem "activesupport", github: "rails/rails"
+gem "activerecord", github: "rails/rails"
+gem "actionpack", github: "rails/rails"
+gem "activejob", github: "rails/rails"
+
+gem "rake"
+gem "byebug"
-gem 'sqlite3'
-gem 'httparty'
+gem "sqlite3"
+gem "httparty"
+
+gem "aws-sdk", "~> 2", require: false
+gem "google-cloud-storage", "~> 1.3", require: false
gem 'aws-sdk', '~> 2', require: false
gem 'google-cloud-storage', require: false
gem 'mini_magick'
+
+gem "rubocop", require: false