Merge branch 'master' into tarebyte/update-ruby

.env-example

@@ -1,6 +1,13 @@
+# Used for connecting GitHub Classroom to GitHub Enterprise
+GITHUB_ENTERPRISE_URL=
+
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 
+# Used for Google Classroom Roster Integration
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+
 NON_STAFF_GITHUB_ADMIN_IDS=
 
 PINGLISH_ENABLED=

.travis.yml

@@ -48,14 +48,14 @@ env:
     - CLASSROOM_WEBHOOK_URL_PREFIX="https://example.com/github/hooks"
     - GITHUB_CLIENT_ID=client_id
     - GITHUB_CLIENT_SECRET=client_secret
+    - GOOGLE_CLIENT_ID=google_client_id
+    - GOOGLE_CLIENT_SECRET=google_client_secret
     - RAILS_ENV=test
     - RACK_ENV=test
     - REDIS_URL="redis://localhost:6379/0"
     - WEBHOOK_SECRET=abcdefg
     - API_SECRET=abcdefg
   matrix:
-    - CI_NODE_INDEX=0 DB_VERSION=9.4
-    - CI_NODE_INDEX=1 DB_VERSION=9.4
     - CI_NODE_INDEX=0 DB_VERSION=10
     - CI_NODE_INDEX=1 DB_VERSION=10
 

Brewfile

@@ -3,10 +3,12 @@
 tap "caskroom/cask"
 tap "github/bootstrap"
 
-cask "docker"
+cask "docker" unless system "which docker"
 cask "ngrok"
 
+brew "tmux"
+brew "overmind"
 brew "nginx", restart_service: :changed
-brew "postgresql@9.4"
+brew "postgresql@10"
 brew "terminal-notifier"
 brew "yarn"

CODEOWNERS

@@ -1,7 +1,7 @@
 # Code owners
 # -----------
 
-*               @srinjoym @benemdon @d12
+*               @education/classroom-reviewers
 
 README.md       @mozzadrella
 ROADMAP.md      @mozzadrella

Gemfile

@@ -8,24 +8,27 @@ git_source(:github) do |repo_name|
 end
 
 ruby File.read(File.expand_path("../.ruby-version", __FILE__)).chomp
-gem "rails", "~> 5.1", ">= 5.1.7"
+gem "rails", "~> 5.2.3"
 
 gem "autoprefixer-rails", "~> 7.1", ">= 7.1.3"
 
+gem "barnes"
 gem "bootsnap", "~> 1.1", ">= 1.1.2", require: false
 
-gem "chewy", "~> 5.0.0"
 gem "connection_pool", "~> 2.2", ">= 2.2.1"
 
 gem "dalli", "~> 2.7", ">= 2.7.6"
 
 gem "failbot_rails",      "~> 0.5.0"
 gem "faraday-http-cache", "~> 2.0"
+gem "faraday_middleware", "~> 0.13.1"
 gem "flipper",            "~> 0.10.2"
 gem "flipper-redis",      "~> 0.10.2"
 gem "flipper-ui",         "~> 0.10.2"
 
 gem "geo_pattern", "~> 1.4"
+gem "google-api-client", "~> 0.11"
+gem "googleauth", "~> 0.8.0"
 gem "graphql", "1.8.4"
 
 # Using fork of graphql-client which fixes a bug in graphql-client on Rails 5
@@ -39,24 +42,27 @@ gem "active_model_serializers", "~> 0.10.0"
 gem "api-pagination", "4.7.1"
 gem "kaminari", "~> 1.0", ">= 1.0.1"
 
+gem "ims-lti", "~> 2.2.3"
 gem "local_time", "~> 2.0"
 
+gem "oauth",           "~> 0.5.4"
 gem "octicons_helper", "~> 2.1"
-gem "octokit", github: "octokit/octokit.rb", ref: "ffae5ddd6fd9da6f4538ca7adeb5d1768011610b"
+gem "octokit", github: "octokit/octokit.rb"
 gem "octopoller",      "~> 0.1"
 gem "omniauth-github", "~> 1.3"
 
 gem "peek",                 "~> 1.0", ">= 1.0.1"
-gem "peek-dalli",           "1.1.3.4.g0a68e1f"
+gem "peek-dalli",           "1.2.0"
 gem "peek-gc",              "~> 0.0.2"
 gem "peek-git",             "~> 1.0", ">= 1.0.2"
-gem "peek-performance_bar", "1.2"
+gem "peek-performance_bar", "1.3.1"
 gem "peek-pg",              "~> 1.3"
-gem "peek-sidekiq",         "1.0.0.4.g261c857"
+gem "peek-sidekiq",         "1.0.4"
 gem "pg",                   "~> 1.1.4"
+gem "pg_search",            "~> 2.2"
 gem "pry-byebug",           "~> 3.5"
 gem "pry-rails",            "~> 0.3.6"
-gem "puma",                 "~> 3.10"
+gem "puma",                 "~> 4.0", ">= 4.0.1"
 
 gem "rack-canonical-host", "~> 0.2.3"
 gem "rack-rewrite",        "~> 1.5.0"
@@ -68,24 +74,23 @@ gem "ruby-progressbar",    "~> 1.8", ">= 1.8.1", require: false
 gem "kramdown",            "~> 1.17.0"
 
 gem "sass-rails", "~> 5.0", ">= 5.0.6"
-gem "sidekiq",    "~> 5.0", ">= 5.0.4"
+gem "sidekiq",    "~> 5.2", ">= 5.2.7"
 gem "sprockets",  "~> 3.7", ">= 3.7.2"
 
-gem "turbolinks", "2.5.3.226.g37a7c29"
+gem "turbolinks", "~> 2.5", ">= 2.5.4"
 gem "typhoeus",   "~> 1.3"
 
 gem "uglifier",      "~> 3.2"
 gem "unicode-emoji", "~> 1.1"
 
 group :development do
-  gem "foreman",     "~> 0.84.0"
   gem "web-console", "~> 3.5", ">= 3.5.1"
 end
 
 group :development, :test do
   gem "awesome_print",            "~> 1.8", require: "ap"
-  gem "bullet",                   "~> 5.6", ">= 5.6.1"
-  gem "dotenv-rails",             "~> 2.2", ">= 2.2.1"
+  gem "bullet",                   "~> 6.0.1"
+  gem "dotenv-rails",             "~> 2.7.4"
   gem "fuubar",                   "~> 2.4.0"
   gem "guard-rspec",              "~> 4.7", ">= 4.7.3", require: false
   gem "knapsack",                 "~> 1.14", ">= 1.14.1"
@@ -100,13 +105,12 @@ group :development, :test do
 end
 
 group :production do
-  gem "airbrake",           "~> 6.2", ">= 6.2.1"
   gem "dogstatsd-ruby",     "~> 3.0"
-  gem "lograge",            "~> 0.6.0"
+  gem "lograge",            "~> 0.11.2"
   gem "newrelic_rpm",       "~> 4.4", ">= 4.4.0.336"
   gem "pinglish",           "~> 0.2.1"
-  gem "puma_worker_killer", "~> 0.1.0"
-  gem "rack-tracker",       "~> 1.4"
+  gem "puma_worker_killer", "~> 0.1.1"
+  gem "rack-tracker",       "~> 1.11.1"
 end
 
 group :test do